diff options
| author | Tim Penhey <tim.penhey@canonical.com> | 2012-11-29 11:02:55 +1300 |
|---|---|---|
| committer | Tim Penhey <tim.penhey@canonical.com> | 2012-11-29 11:02:55 +1300 |
| commit | 9331e31cef9c79a7d37c7092f6dbfc2fe957e6dd (patch) | |
| tree | fa266aba799f3d6b8ac92362637b28673052fd22 /unity-shared/CMakeLists.txt | |
| parent | f344df8ef759865bd0f0aa21ede0dbea89d84e3c (diff) | |
| parent | 09bbf1b500dcc0ac9c137c41d10b80302aa618c5 (diff) | |
Merge trunk.
(bzr r2932.1.5)
Diffstat (limited to 'unity-shared/CMakeLists.txt')
| -rw-r--r-- | unity-shared/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index fa1e911ae..fe44bb0cb 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -5,8 +5,6 @@ find_package (PkgConfig) set (CFLAGS ${CACHED_UNITY_DEPS_CFLAGS} ${CACHED_UNITY_DEPS_CFLAGS_OTHER} - "-DGETTEXT_PACKAGE=\"unity\"" - "-I${CMAKE_CURRENT_BINARY_DIR}" ) if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l") @@ -20,7 +18,7 @@ set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD}) set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS}) -include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR}) # # Headers & Sources |