From 15b5e81bf4a5ea6f8785adbd39a71999adc2c4d7 Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Wed, 28 Nov 2012 13:59:08 -0430 Subject: right usage of GNUinstall dirs, and added module if distros not have yet --- CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e160c14..b6b272e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,9 @@ cmake_minimum_required(VERSION 2.6) set(HARDINFO_VERSION "0.5.2pre") +SET( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ) include(GNUInstallDirs) -if(${CMAKE_BUILD_TYPE} MATCHES "Debug") - set(HARDINFO_DEBUG 1) -endif() - if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") set(HARDINFO_OS "linux") else() @@ -189,21 +186,20 @@ install(TARGETS hardinfo ${HARDINFO_MODULES} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop - DESTINATION share/applications + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) install(FILES ${HARDINFO_RESOURCES} - DESTINATION share/hardinfo + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hardinfo PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) install(DIRECTORY pixmaps - DESTINATION share/hardinfo + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hardinfo PATTERN "*.{png,svg}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) install(DIRECTORY doc - DESTINATION share/hardinfo + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hardinfo PATTERN "*.{hlp,png}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) - -- cgit v1.2.3