From e0e747839b239e87cd04ba0f7eb18f632714398a Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 30 May 2012 01:49:33 +0200 Subject: Use GNUInstallDirs and respect lib suffix --- CMakeLists.txt | 8 +++++--- 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__ */ -- cgit v1.2.3 From e05f8494126c999ae6227195442126cbb7d630c5 Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 30 May 2012 01:52:10 +0200 Subject: Split x86 and x86_64 arches lib suffix in hardinfo/binreloc.c is already supported and will be respected now --- CMakeLists.txt | 4 +++- includes/devices.h | 6 +++--- includes/x86_64 | 1 + modules/devices.c | 12 ++++++------ modules/devices/x86_64 | 1 + 5 files changed, 14 insertions(+), 10 deletions(-) create mode 120000 includes/x86_64 create mode 120000 modules/devices/x86_64 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b270e9c..3e1edc66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,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") diff --git a/includes/devices.h b/includes/devices.h index 3af92f60..f88e5325 100644 --- a/includes/devices.h +++ b/includes/devices.h @@ -64,7 +64,7 @@ void scan_sensors_do(void); void sensors_init(void); void sensors_shutdown(void); -#ifdef ARCH_x86 +#if defined(ARCH_x86) || defined(ARCH_x86_64) /* SPD */ void scan_spd_do(void); #endif /* ARCH_x86 */ @@ -88,9 +88,9 @@ extern GHashTable *sensor_compute; extern GHashTable *sensor_labels; extern GModule *cups; -#ifdef ARCH_x86 +#if defined(ARCH_x86) || defined(ARCH_x86_64) extern gchar *dmi_info; extern gchar *spd_info; #endif -#endif /* __DEVICES_H__ */ \ No newline at end of file +#endif /* __DEVICES_H__ */ diff --git a/includes/x86_64 b/includes/x86_64 new file mode 120000 index 00000000..de1ff735 --- /dev/null +++ b/includes/x86_64 @@ -0,0 +1 @@ +./x86 \ No newline at end of file diff --git a/modules/devices.c b/modules/devices.c index 5f1e61d5..6c6343d5 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -47,7 +47,7 @@ gchar *callback_printers(); gchar *callback_storage(); gchar *callback_input(); gchar *callback_usb(); -#if defined(ARCH_x86) +#if defined(ARCH_x86) || defined(ARCH_x86_64) gchar *callback_dmi(); gchar *callback_spd(); #endif @@ -62,7 +62,7 @@ void scan_printers(gboolean reload); void scan_storage(gboolean reload); void scan_input(gboolean reload); void scan_usb(gboolean reload); -#if defined(ARCH_x86) +#if defined(ARCH_x86) || defined(ARCH_x86_64) void scan_dmi(gboolean reload); void scan_spd(gboolean reload); #endif @@ -80,7 +80,7 @@ static ModuleEntry entries[] = { {"Sensors", "therm.png", callback_sensors, scan_sensors, MODULE_FLAG_NONE}, {"Input Devices", "inputdevices.png", callback_input, scan_input, MODULE_FLAG_NONE}, {"Storage", "hdd.png", callback_storage, scan_storage, MODULE_FLAG_NONE}, -#if defined(ARCH_x86) +#if defined(ARCH_x86) || defined(ARCH_x86_64) {"DMI", "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, {"Memory SPD", "memory.png", callback_spd, scan_spd, MODULE_FLAG_NONE}, #endif /* x86 or x86_64 */ @@ -235,7 +235,7 @@ gchar *hi_get_field(gchar * field) return g_strdup(field); } -#if defined(ARCH_x86) +#if defined(ARCH_x86) || defined(ARCH_x86_64) void scan_dmi(gboolean reload) { SCAN_START(); @@ -324,7 +324,7 @@ gchar *callback_processors() return processor_get_info(processors); } -#if defined(ARCH_x86) +#if defined(ARCH_x86) || defined(ARCH_x86_64) gchar *callback_dmi() { return g_strdup(dmi_info); @@ -430,7 +430,7 @@ void hi_module_init(void) sync_manager_add_entry(&se); } -#if defined(ARCH_x86) +#if defined(ARCH_x86) || defined(ARCH_x86_64) { static SyncEntry se = { .fancy_name = "Update CPU feature database", diff --git a/modules/devices/x86_64 b/modules/devices/x86_64 new file mode 120000 index 00000000..de1ff735 --- /dev/null +++ b/modules/devices/x86_64 @@ -0,0 +1 @@ +./x86 \ No newline at end of file -- cgit v1.2.3 From 9cc35bf30682d4a5b7ed499e2609f6ba8b776c4f Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 30 May 2012 01:53:38 +0200 Subject: Fix underlinking wrt https://bugs.gentoo.org/show_bug.cgi?id=418121 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1edc66..1e160c14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ target_link_libraries(hardinfo ${GTK_LIBRARIES} ${LIBSOUP_LIBRARIES} hardinfo-shell + m ) target_link_libraries(hardinfo-shell hardinfo-help-viewer -- cgit v1.2.3