diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-02-09 12:20:54 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2016-02-09 12:20:54 +0000 |
| commit | 02ff690067646b495d7a50fc66b150906375dc27 (patch) | |
| tree | c3df0de0a866735f288aaa7a38ed3cac73571329 /plugins | |
| parent | 62983e01eb5d12e19b57f1c3ceeb843f0edbd72b (diff) | |
| parent | 91bf76fa056b987cb56e29d628f12cc0855add83 (diff) | |
CMake: use GNUInstallDirs with native multi-arch support
We can now use CMAKE_INSTALL_*DIR instead of defining them manually. Also disable networkarea region plugin build by default. Fixes: #1485668, #1508635 Approved by: Andrea Azzarone (bzr r4072)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/networkarearegion/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | plugins/unity-mt-grab-handles/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | plugins/unityshell/CMakeLists.txt | 7 |
3 files changed, 16 insertions, 1 deletions
diff --git a/plugins/networkarearegion/CMakeLists.txt b/plugins/networkarearegion/CMakeLists.txt index ea1ece005..7d7af425b 100644 --- a/plugins/networkarearegion/CMakeLists.txt +++ b/plugins/networkarearegion/CMakeLists.txt @@ -8,6 +8,11 @@ if(CMAKE_BUILD_TYPE STREQUAL "") set(revert_compiz TRUE) endif() +set (libdir ${CMAKE_INSTALL_LIBDIR}) +set (includedir ${CMAKE_INSTALL_INCLUDEDIR}) +set (libdir ${CMAKE_INSTALL_LIBDIR}) +set (datadir ${CMAKE_INSTALL_FULL_DATADIR}) + compiz_plugin (networkarearegion) if(revert_compiz) diff --git a/plugins/unity-mt-grab-handles/CMakeLists.txt b/plugins/unity-mt-grab-handles/CMakeLists.txt index ec13c9f0d..acaaa8db3 100644 --- a/plugins/unity-mt-grab-handles/CMakeLists.txt +++ b/plugins/unity-mt-grab-handles/CMakeLists.txt @@ -8,6 +8,11 @@ if(CMAKE_BUILD_TYPE STREQUAL "") set(revert_compiz TRUE) endif() +set (libdir ${CMAKE_INSTALL_LIBDIR}) +set (includedir ${CMAKE_INSTALL_INCLUDEDIR}) +set (libdir ${CMAKE_INSTALL_LIBDIR}) +set (datadir ${CMAKE_INSTALL_FULL_DATADIR}) + compiz_plugin (unitymtgrabhandles PKGDEPS nux-4.0>=4.0.0 PLUGINDEPS composite opengl CFLAGSADD -std=c++0x) if(revert_compiz) diff --git a/plugins/unityshell/CMakeLists.txt b/plugins/unityshell/CMakeLists.txt index 01a300589..b7e5b5f78 100644 --- a/plugins/unityshell/CMakeLists.txt +++ b/plugins/unityshell/CMakeLists.txt @@ -10,6 +10,11 @@ if(CMAKE_BUILD_TYPE STREQUAL "") set(revert_compiz TRUE) endif() +set (libdir ${CMAKE_INSTALL_LIBDIR}) +set (includedir ${CMAKE_INSTALL_INCLUDEDIR}) +set (libdir ${CMAKE_INSTALL_LIBDIR}) +set (datadir ${CMAKE_INSTALL_FULL_DATADIR}) + compiz_plugin (unityshell PKGDEPS ${UNITY_PLUGIN_DEPS} PLUGINDEPS composite opengl compiztoolbox scale @@ -50,4 +55,4 @@ set_target_properties(unityshell # # Data # -install (FILES plugin-unityshell.png DESTINATION ${DATADIR}/ccsm/icons/hicolor/64x64/apps) +install (FILES plugin-unityshell.png DESTINATION ${COMPIZ_DATADIR}/ccsm/icons/hicolor/64x64/apps) |