diff options
| author | Jussi Pakkanen <jussi.pakkanen@canonical.com> | 2012-12-19 16:31:44 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@canonical.com> | 2012-12-19 16:31:44 +0200 |
| commit | ffe260b0b975aa52ff28fb535aea4e6e24bc7ddf (patch) | |
| tree | b9bcc7a7a6c99962620f34c7ebefd8f837a8bc3e | |
| parent | 95dc19917e9dd38bb557b176ff79de670482687b (diff) | |
Removed link_libraries from unity-shared.
(bzr r3001.1.2)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | unity-shared/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2310f4770..7bd22b28e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,9 +45,9 @@ endif () if (BUILD_GLES) add_definitions(-DNUX_OPENGLES_20) add_definitions(-DUSE_GLES) - set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl") + set (UNITY_STANDALONE_LADD "unity-core-${UNITY_API_VERSION};m;pthread;dl") else () - set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl -lGL -lGLU") + set (UNITY_STANDALONE_LADD "unity-core-${UNITY_API_VERSION};m;pthread;dl;GL;GLU") endif () if (CMAKE_BUILD_TYPE MATCHES coverage) diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index b4df6d020..6ccd91906 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -9,10 +9,7 @@ set (CFLAGS string (REPLACE ";" " " CFLAGS "${CFLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}") -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}) +set (LIBS ${CACHED_UNITY_DEPS_LDFLAGS} ${UNITY_STANDALONE_LADD}) include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR}) |