diff options
| author | Sam Spilsbury <sam.spilsbury@canonical.com> | 2012-08-30 20:51:46 +0800 |
|---|---|---|
| committer | Sam Spilsbury <sam.spilsbury@canonical.com> | 2012-08-30 20:51:46 +0800 |
| commit | f07a65e4e3f174509fa0187d53df30ceabd9c29b (patch) | |
| tree | e032eb465294558d321f18f6ebdf47d2ca774d3d /unity-shared/CMakeLists.txt | |
| parent | a011109f609567c48ef3c54f04f3d22f544da004 (diff) | |
Use target_link_libraries, link in pthread by default
(bzr r2637.1.1)
Diffstat (limited to 'unity-shared/CMakeLists.txt')
| -rw-r--r-- | unity-shared/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt index d1b06f000..c2c5b9562 100644 --- a/unity-shared/CMakeLists.txt +++ b/unity-shared/CMakeLists.txt @@ -18,8 +18,6 @@ add_definitions (${CFLAGS}) set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} ${UNITY_STANDALONE_LADD}) -link_libraries (${LIBS}) - set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS}) link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS}) @@ -70,6 +68,7 @@ set (UNITY_SHARED_SOURCES ) add_library (unity-shared STATIC ${UNITY_SHARED_SOURCES}) +target_link_libraries (unity-shared ${LIBS}) add_dependencies (unity-shared unity-core-${UNITY_API_VERSION}) # @@ -81,6 +80,8 @@ set (UNITY_SHARED_COMPIZ_SOURCES PluginAdapterCompiz.cpp ) add_library (unity-shared-compiz STATIC ${UNITY_SHARED_COMPIZ_SOURCES}) +target_link_libraries (unity-shared-compiz ${LIBS}) + add_dependencies (unity-shared-compiz unity-shared) # standalone @@ -88,6 +89,7 @@ set (UNITY_SHARED_STANDALONE_SOURCES PluginAdapterStandalone.cpp ) add_library (unity-shared-standalone STATIC ${UNITY_SHARED_STANDALONE_SOURCES}) +target_link_libraries (unity-shared-standalone ${LIBS}) add_dependencies (unity-shared-standalone unity-shared) |