diff options
| author | hasufell <julian.ospald@googlemail.com> | 2012-05-30 01:49:33 +0200 |
|---|---|---|
| committer | hasufell <julian.ospald@googlemail.com> | 2012-05-30 01:49:33 +0200 |
| commit | e0e747839b239e87cd04ba0f7eb18f632714398a (patch) | |
| tree | 3835ead2d62b21830938f8230cdeb1492273ac88 | |
| parent | 22fec2cf18c5caba53d60a9dc1142e475830b374 (diff) | |
Use GNUInstallDirs and respect lib suffix
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | config.h.cmake | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e4c872d9..1b270e9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 2.6) set(HARDINFO_VERSION "0.5.2pre") +include(GNUInstallDirs) + if(${CMAKE_BUILD_TYPE} MATCHES "Debug") set(HARDINFO_DEBUG 1) endif() @@ -179,8 +181,8 @@ configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h @ONLY) configure_file(hardinfo.desktop.cmake ${CMAKE_BINARY_DIR}/hardinfo.desktop @ONLY) install(TARGETS hardinfo ${HARDINFO_MODULES} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/hardinfo/modules + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hardinfo/modules PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop @@ -201,4 +203,4 @@ install(DIRECTORY doc PATTERN "*.{hlp,png}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -
\ No newline at end of file + diff --git a/config.h.cmake b/config.h.cmake index 2c8440c8..455da69a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -10,7 +10,7 @@ #define HOSTNAME "" #define ARCH_@HARDINFO_ARCH@ -#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/lib/hardinfo" +#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo" #define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo" #cmakedefine LIBSOUP_FOUND @@ -32,4 +32,4 @@ #define ENABLE_BINRELOC 1 #define HAS_LINUX_WE 1 -#endif /* __CONFIG_H__ */
\ No newline at end of file +#endif /* __CONFIG_H__ */ |