diff options
| author | Tim Penhey <tim.penhey@canonical.com> | 2012-11-29 11:05:07 +1300 |
|---|---|---|
| committer | Tim Penhey <tim.penhey@canonical.com> | 2012-11-29 11:05:07 +1300 |
| commit | 4b8493aa731726884c4431dc791d65d9b075a6de (patch) | |
| tree | 23eb6d47e420c13b7d0a0d2287b2c1ec317216d2 /unity-standalone | |
| parent | 5dba3bcd954de5d582ddbdb4e2192a434c95e366 (diff) | |
| parent | a1ac94e2eea458b07e5a7516673128b7dbe1b259 (diff) | |
Merge prev and resolve conflicts.
(bzr r2791.9.51)
Diffstat (limited to 'unity-standalone')
| -rw-r--r-- | unity-standalone/CMakeLists.txt | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt index e9e78b5cf..552f6352e 100644 --- a/unity-standalone/CMakeLists.txt +++ b/unity-standalone/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") @@ -22,7 +20,7 @@ link_libraries (${LIBS}) 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 @@ -32,12 +30,6 @@ set (STANDALONE_SOURCES ) add_executable (unity-standalone StandaloneUnity.cpp) -add_dependencies (unity-standalone - dash-lib - launcher-lib - panel-lib - unity-shared - unity-shared-standalone) target_link_libraries (unity-standalone dash-lib launcher-lib |