hardinfo

Check-in [4f6525c26e]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:upstream: Use GNUInstallDirs and respect lib suffix
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:4f6525c26e27807ff280d932b39d586082529d6a
User & Date: jamesbond 2014-06-06 18:43:20
Context
2014-06-06
18:44
upstream: Split x86 and x86_64 arches check-in: d61b38eb37 user: jamesbond tags: trunk
18:43
upstream: Use GNUInstallDirs and respect lib suffix check-in: 4f6525c26e user: jamesbond tags: trunk
18:41
upstream: Do not crash if CUPS libraries were not found check-in: 94e693ea38 user: jamesbond tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to CMakeLists.txt.

1
2
3
4


5
6
7
8
9
10
11
...
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
...
197
198
199
200
201
202
203
204
project(HardInfo)
cmake_minimum_required(VERSION 2.6)

set(HARDINFO_VERSION "0.5.2pre")



if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
	set(HARDINFO_DEBUG 1)
endif()

if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
	set(HARDINFO_OS "linux")
................................................................................
	hardinfo-remote
)

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
	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
	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
install(FILES ${HARDINFO_RESOURCES}
................................................................................
	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
install(DIRECTORY doc
	DESTINATION share/hardinfo
	PATTERN "*.{hlp,png}"
	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
	




>
>







 







|
|







 







|
1
2
3
4
5
6
7
8
9
10
11
12
13
...
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
...
199
200
201
202
203
204
205
206
project(HardInfo)
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()

if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
	set(HARDINFO_OS "linux")
................................................................................
	hardinfo-remote
)

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 ${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
	DESTINATION share/applications
	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
install(FILES ${HARDINFO_RESOURCES}
................................................................................
	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
install(DIRECTORY doc
	DESTINATION share/hardinfo
	PATTERN "*.{hlp,png}"
	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)

Changes to config.h.cmake.

6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
#define ARCH			"ARCH_@HARDINFO_ARCH@"
#define OS			"@HARDINFO_OS@"
#define PLATFORM		OS "-" ARCH
#define KERNEL			"@CMAKE_SYSTEM_VERSION@"
#define HOSTNAME		""
#define ARCH_@HARDINFO_ARCH@

#define LIBPREFIX		"@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
#define PREFIX			"@CMAKE_INSTALL_PREFIX@/share/hardinfo"

#cmakedefine LIBSOUP_FOUND
#cmakedefine HARDINFO_DEBUG	@HARDINFO_DEBUG@

#ifdef LIBSOUP_FOUND
#	define HAS_LIBSOUP







|







6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
#define ARCH			"ARCH_@HARDINFO_ARCH@"
#define OS			"@HARDINFO_OS@"
#define PLATFORM		OS "-" ARCH
#define KERNEL			"@CMAKE_SYSTEM_VERSION@"
#define HOSTNAME		""
#define ARCH_@HARDINFO_ARCH@

#define LIBPREFIX		"@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
#define PREFIX			"@CMAKE_INSTALL_PREFIX@/share/hardinfo"

#cmakedefine LIBSOUP_FOUND
#cmakedefine HARDINFO_DEBUG	@HARDINFO_DEBUG@

#ifdef LIBSOUP_FOUND
#	define HAS_LIBSOUP