diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-08-31 17:57:01 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-08-31 17:57:01 +0200 |
| commit | 6e791f5e47fde10f9bd1a80170fa46d0d7c49bcf (patch) | |
| tree | d2cdb533878977a2fd643288378b6bea4e6c4697 /tools | |
| parent | 7997fa4290cdc551dfc7c07cfe2186f294269bf8 (diff) | |
| parent | 441ef596be2d17da00085692e0b2f77162ede238 (diff) | |
Merging with lp:~3v1n0/unity/cmake-libs-prefixes
(bzr r4153.9.32)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | tools/unity-compiz-profile-select.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 361fbe590..4fbc611c8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,7 +1,7 @@ # # Some unity tools # -install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity) +install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${UNITY_INSTALL_LIBDIR}) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity) install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ @@ -27,7 +27,7 @@ link_directories(${LIB_PATHS}) add_executable(unity-active-plugins-safety-check unity_active_plugins_safety_check.cpp) target_link_libraries(unity-active-plugins-safety-check ${LIBS}) -install(TARGETS unity-active-plugins-safety-check DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/) +install(TARGETS unity-active-plugins-safety-check DESTINATION ${UNITY_INSTALL_LIBDIR}) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity-compiz-profile-select.in ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select @ONLY) -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select DESTINATION ${UNITY_INSTALL_LIBDIR}) diff --git a/tools/unity-compiz-profile-select.in b/tools/unity-compiz-profile-select.in index 70f56ff7b..4ab23c5d4 100755 --- a/tools/unity-compiz-profile-select.in +++ b/tools/unity-compiz-profile-select.in @@ -22,4 +22,4 @@ initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile" systemctl set-environment --user COMPIZ_CONFIG_PROFILE="$compiz_profile" export COMPIZ_CONFIG_PROFILE="$compiz_profile" -exec @CMAKE_INSTALL_FULL_LIBDIR@/unity/unity-active-plugins-safety-check +exec @UNITY_LIBDIR@/unity-active-plugins-safety-check |