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 /UnityCore | |
| 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 'UnityCore')
| -rw-r--r-- | UnityCore/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | UnityCore/DBusIndicators.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/UnityCore/CMakeLists.txt b/UnityCore/CMakeLists.txt index f055790d3..0693f7e67 100644 --- a/UnityCore/CMakeLists.txt +++ b/UnityCore/CMakeLists.txt @@ -149,22 +149,22 @@ set_target_properties(${CORE_LIB_NAME} PROPERTIES add_pch(pch/unitycore_pch.hh ${CORE_LIB_NAME}) install (TARGETS ${CORE_LIB_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # # Headers # -install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Unity-${UNITY_API_VERSION}/UnityCore) +install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Unity-${UNITY_API_VERSION}/UnityCore) # # PkgConfig file # -set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}") -set (LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -set (INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include") +set (EXEC_PREFIX "${CMAKE_INSTALL_LIBEXECDIR}") +set (LIBDIR "${CMAKE_INSTALL_LIBDIR}") +set (INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") configure_file (unity-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc @ONLY) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/UnityCore/DBusIndicators.cpp b/UnityCore/DBusIndicators.cpp index b890124c3..6021418f2 100644 --- a/UnityCore/DBusIndicators.cpp +++ b/UnityCore/DBusIndicators.cpp @@ -123,7 +123,7 @@ void DBusIndicators::Impl::CheckLocalService() // This is obviously hackish, but this part of the code is mostly hackish... // Let's attempt to run it from where we expect it to be - std::string cmd = PREFIXDIR + std::string("/lib/unity/unity-panel-service"); + std::string cmd = UNITYLIBDIR"/" + std::string("unity-panel-service"); LOG_WARN(logger) << "Couldn't load panel from installed services, " << "so trying to load panel from known location: " << cmd; |