diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2012-06-01 07:14:43 -0700 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2012-06-01 07:14:43 -0700 |
| commit | f05c78c8a3458acce36941a3639e4e8780e10119 (patch) | |
| tree | 10b0a5a7c73e926e32af7039c33efcaf04af5dbb /CMakeLists.txt | |
| parent | 22fec2cf18c5caba53d60a9dc1142e475830b374 (diff) | |
| parent | 9cc35bf30682d4a5b7ed499e2609f6ba8b776c4f (diff) | |
Merge pull request #1 from hasufell/master
improve build system
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e4c872d9..1e160c14 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() @@ -13,8 +15,10 @@ else() message(FATAL_ERROR "Unsupported operating system: ${CMAKE_HOST_SYSTEM_NAME}") endif() -if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "i[3-6]86|x86_64") +if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "i[3-6]86") set(HARDINFO_ARCH "x86") +elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "x86_64") + set(HARDINFO_ARCH "x86_64") elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "ppc{32,64}") set(HARDINFO_ARCH "ppc") elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "mips") @@ -169,6 +173,7 @@ target_link_libraries(hardinfo ${GTK_LIBRARIES} ${LIBSOUP_LIBRARIES} hardinfo-shell + m ) target_link_libraries(hardinfo-shell hardinfo-help-viewer @@ -179,8 +184,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 +206,4 @@ install(DIRECTORY doc PATTERN "*.{hlp,png}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -
\ No newline at end of file + |