diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> | 2012-08-03 10:10:40 -0400 |
|---|---|---|
| committer | Tarmac <> | 2012-08-03 10:10:40 -0400 |
| commit | 72dd1138bab786aaba34234fa1ddbf92503692c4 (patch) | |
| tree | c56491c68d2819987873726e031f3179d5bd028f | |
| parent | 5bfa14ce7fb3ec17da70ef049f15acd2b4123d71 (diff) | |
| parent | 43fe5611a09b9b3d20d4bd1b3fdf44f0431d2ca6 (diff) | |
Add the libunity private directory to unityshell.so and libunity-core-6.0.so RPATHs, so that they can easily find the libunity-protocol-private.so library on load.. Fixes: . Approved by Michal Hruby.
(bzr r2537)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | UnityCore/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | plugins/unityshell/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5773407de..2aefa298f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,11 +133,14 @@ endif (DISABLE_MAINTAINER_CFLAGS) # # Compiz Plugins # + set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.93.1") # FIXME: unity-protocol-private shouldn't be there, but building of unityshell is just broken +set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.93.1") find_package (PkgConfig) pkg_check_modules (CACHED_UNITY_DEPS REQUIRED ${UNITY_PLUGIN_DEPS}) +pkg_check_modules (CACHED_UNITY_PRIVATE_DEPS REQUIRED ${UNITY_PROTOCOL_PRIVATE_DEPS}) add_subdirectory(unity-shared) add_subdirectory(panel) add_subdirectory(dash) diff --git a/UnityCore/CMakeLists.txt b/UnityCore/CMakeLists.txt index 5393f2c8c..0ae006c41 100644 --- a/UnityCore/CMakeLists.txt +++ b/UnityCore/CMakeLists.txt @@ -1,5 +1,6 @@ find_package (PkgConfig) pkg_check_modules (CORE_DEPS REQUIRED glib-2.0 gio-2.0 dee-1.0 sigc++-2.0 nux-core-3.0 gdk-pixbuf-2.0 unity-protocol-private) +pkg_check_modules (PRIVATE_CORE_DEPS REQUIRED unity-protocol-private) execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} unity --variable lensesdir OUTPUT_VARIABLE _lensesdir OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -124,7 +125,8 @@ set (CORE_LIB_NAME "unity-core-${UNITY_API_VERSION}") add_library (${CORE_LIB_NAME} SHARED ${CORE_SOURCES}) set_target_properties(${CORE_LIB_NAME} PROPERTIES VERSION ${CORE_LIB_LT_CURRENT}.${CORE_LIB_LT_REV}.${CORE_LIB_LT_AGE} - SOVERSION ${CORE_LIB_LT_CURRENT}) + SOVERSION ${CORE_LIB_LT_CURRENT} + INSTALL_RPATH "${PRIVATE_CORE_DEPS_LIBRARY_DIRS}") install (TARGETS ${CORE_LIB_NAME} RUNTIME DESTINATION bin diff --git a/plugins/unityshell/CMakeLists.txt b/plugins/unityshell/CMakeLists.txt index 2e11fb453..eaf2047a3 100644 --- a/plugins/unityshell/CMakeLists.txt +++ b/plugins/unityshell/CMakeLists.txt @@ -12,6 +12,9 @@ compiz_plugin (unityshell ) add_dependencies(unityshell unity-core-${UNITY_API_VERSION} dash-lib launcher-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-compiz) target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-compiz) +set_target_properties(unityshell + PROPERTIES INSTALL_RPATH "${CACHED_UNITY_PRIVATE_DEPS_LIBRARY_DIRS}" + INSTALL_RPATH_USE_LINK_PATH TRUE) # # Data |