Rename some CMake variables, rename data/pictures to data/logos, add …

…CMakeLists.txt in data/logos

CMakeLists.txt

@@ -8,12 +8,14 @@ project(cpu-x
 ### DEFAULT CONFIG
 
 # Global variables
+include(GNUInstallDirs)
 if(PORTABLE_BINARY)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY	${CMAKE_BINARY_DIR})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 else(PORTABLE_BINARY)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY	${CMAKE_BINARY_DIR}/OUTPUT/bin/)
-	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY	${CMAKE_BINARY_DIR}/OUTPUT/lib/)
-	set(DATA_DIR				${CMAKE_BINARY_DIR}/OUTPUT/data/)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/OUTPUT/bin/)
+	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/OUTPUT/lib/)
+	set(CMAKE_DATA_OUTPUT_DIRECTORY    ${CMAKE_BINARY_DIR}/OUTPUT/data/)
+	set(CPU_X_DATA_DIRECTORY           ${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}/)
 endif(PORTABLE_BINARY)
 set(CPU_X_DEBUG_FLAGS     "-Wall -Wextra -Wuninitialized -Wstrict-prototypes -Wno-unused-parameter")
 set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   ${CPU_X_DEBUG_FLAGS}")
@@ -108,15 +110,13 @@ endmacro(add_embedded_library_others)
 
 
 ### HELPERS / SUB-DIRECTORIES
-include(GNUInstallDirs)
 find_package(PkgConfig REQUIRED)
 add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(data)
 
 
 ### UNINSTALL TARGET
-set(CPUX_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}/)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
 	"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
 	IMMEDIATE @ONLY

cmake_uninstall.cmake.in

@@ -21,4 +21,4 @@ foreach(file ${files})
 	endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
 endforeach(file)
 
-file(REMOVE_RECURSE @CPUX_DATADIR@)
+file(REMOVE_RECURSE @CPU_X_DATA_DIRECTORY@)

data/CMakeLists.txt

@@ -6,48 +6,43 @@ project(data)
 # Files needed by GTK GUI
 if(WITH_GTK AND NOT PORTABLE_BINARY)
 	# Set config
-	file(MAKE_DIRECTORY ${DATA_DIR})
-	set(EXEC ${CMAKE_INSTALL_FULL_BINDIR}/${CMAKE_PROJECT_NAME})
+	file(MAKE_DIRECTORY ${CMAKE_DATA_OUTPUT_DIRECTORY})
+	set(EXEC    ${CMAKE_INSTALL_FULL_BINDIR}/${CMAKE_PROJECT_NAME})
 	set(TRYEXEC ${EXEC})
-	configure_file(cpu-x.desktop.in ${DATA_DIR}/cpu-x.desktop)
-	configure_file(org.pkexec.cpu-x.policy.in ${DATA_DIR}/org.pkexec.cpu-x.policy)
-	configure_file(cpu-x_polkit.in ${DATA_DIR}/cpu-x_polkit)
+	configure_file(cpu-x.desktop.in           ${CMAKE_DATA_OUTPUT_DIRECTORY}/cpu-x.desktop)
+	configure_file(org.pkexec.cpu-x.policy.in ${CMAKE_DATA_OUTPUT_DIRECTORY}/org.pkexec.cpu-x.policy)
+	configure_file(cpu-x_polkit.in            ${CMAKE_DATA_OUTPUT_DIRECTORY}/cpu-x_polkit)
 
 	set(EXEC ${EXEC}_polkit)
-	configure_file(cpu-x-root.desktop.in ${DATA_DIR}/cpu-x-root.desktop)
-
-	# Install pictures + UIs
-	file(GLOB
-		pictures
-		pictures/*.png
-	)
+	configure_file(cpu-x-root.desktop.in ${CMAKE_DATA_OUTPUT_DIRECTORY}/cpu-x-root.desktop)
 
+	# Install UIs
 	install(FILES
 		cpux-gtk-3.8.ui
 		cpux-gtk-3.14.ui
-		${pictures}
-		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}/
+		DESTINATION ${CPU_X_DATA_DIRECTORY}/
 	)
 
 	# Install launchers
 	install(FILES
-		${DATA_DIR}/cpu-x.desktop
-		${DATA_DIR}/cpu-x-root.desktop
+		${CMAKE_DATA_OUTPUT_DIRECTORY}/cpu-x.desktop
+		${CMAKE_DATA_OUTPUT_DIRECTORY}/cpu-x-root.desktop
 		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications/
 	)
 
 	# Install policy rule
 	install(FILES
-		${DATA_DIR}/org.pkexec.cpu-x.policy
-		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/polkit-1/actions
+		${CMAKE_DATA_OUTPUT_DIRECTORY}/org.pkexec.cpu-x.policy
+		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/polkit-1/actions/
 	)
 
 	# Install binary which can run CPU-X as root via Polkit
 	install(FILES
-		${DATA_DIR}/cpu-x_polkit
+		${CMAKE_DATA_OUTPUT_DIRECTORY}/cpu-x_polkit
 		DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}/
 		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 	)
 
 	add_subdirectory(icons)
+	add_subdirectory(logos)
 endif(WITH_GTK AND NOT PORTABLE_BINARY)

data/icons/CMakeLists.txt

@@ -14,13 +14,13 @@ foreach(icon ${icons})
 	string(REGEX REPLACE "CPU-X_" "" size "${filename}")
 	install(FILES
 		${icon}
-		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${size}/apps
+		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${size}/apps/
 		RENAME cpu-x.png
 	)
 endforeach()
 
 install(FILES
 	CPU-X_original.png
-	DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}/
+	DESTINATION ${CPU_X_DATA_DIRECTORY}/
 	RENAME CPU-X.png
 )

data/logos/CMakeLists.txt

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0048 OLD)
+project(logos)
+
+
+# Logos
+install(FILES
+	AMD.png
+	Centaur.png
+	Cyrix.png
+	Intel.png
+	NexGen.png
+	NSC.png
+	Rise.png
+	SiS.png
+	Transmeta.png
+	UMC.png
+	Unknown.png
+	DESTINATION ${CPU_X_DATA_DIRECTORY}/
+)