diff options
| -rw-r--r-- | dash/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dash/previews/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | hud/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | launcher/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | panel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | services/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | shortcuts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | unity-standalone/CMakeLists.txt | 2 |
9 files changed, 1 insertions, 15 deletions
diff --git a/dash/CMakeLists.txt b/dash/CMakeLists.txt index d621e1bdb..e6e913c74 100644 --- a/dash/CMakeLists.txt +++ b/dash/CMakeLists.txt @@ -15,8 +15,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}) diff --git a/dash/previews/CMakeLists.txt b/dash/previews/CMakeLists.txt index 3c79779de..0df4f7fa5 100644 --- a/dash/previews/CMakeLists.txt +++ b/dash/previews/CMakeLists.txt @@ -14,7 +14,6 @@ endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} 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}) diff --git a/hud/CMakeLists.txt b/hud/CMakeLists.txt index 8628ac193..cecd38fcc 100644 --- a/hud/CMakeLists.txt +++ b/hud/CMakeLists.txt @@ -15,8 +15,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}) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 3917b28b7..6a6538082 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -16,8 +16,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}) diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt index 8ee54da59..0c2747d6c 100644 --- a/panel/CMakeLists.txt +++ b/panel/CMakeLists.txt @@ -15,8 +15,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}) diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index 4257358a8..25a3f9ef9 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -43,12 +43,12 @@ add_definitions(${CFLAGS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(LIBS ${SERVICE_DEPS_LIBRARIES}) -link_libraries(${LIBS}) set(LIB_PATHS ${SERVICE_DEPS_LIBRARY_DIRS}) link_directories(${LIB_PATHS}) add_executable(unity-panel-service ${PANEL_SOURCES}) +target_link_libraries(unity-panel-service ${LIBS}) install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/) configure_file(com.canonical.Unity.Panel.Service.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Panel.Service.service) diff --git a/shortcuts/CMakeLists.txt b/shortcuts/CMakeLists.txt index c2870e93e..c2510e21b 100644 --- a/shortcuts/CMakeLists.txt +++ b/shortcuts/CMakeLists.txt @@ -15,8 +15,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}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7f35cdebb..a8e22b73a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,7 +35,6 @@ set (CFLAGS add_definitions (${CFLAGS}) set (LIBS ${TEST_UNIT_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lcompiz_core -lm") -link_libraries (${LIBS}) set (LIB_PATHS ${TEST_UNIT_DEPS_LIBRARY_DIRS}) link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS} ${COMPIZ_LIBDIR}) diff --git a/unity-standalone/CMakeLists.txt b/unity-standalone/CMakeLists.txt index d86a1a1e5..f6f8bba32 100644 --- a/unity-standalone/CMakeLists.txt +++ b/unity-standalone/CMakeLists.txt @@ -15,8 +15,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}) |