From: Julian Ospald Date: Sat May 26 01:30:39 UTC 2012 Subject: build system use GNUInstallDirs and respect lib suffix --- CMakeLists.txt +++ CMakeLists.txt @@ -3,6 +3,8 @@ 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(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 @@ PATTERN "*.{hlp,png}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) - \ No newline at end of file + --- config.h.cmake +++ 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__ */