chore(cmake): standardize variable naming and packaging configuration

Author: ronan-fesselier

README.md

@@ -185,7 +185,7 @@ The complete API documentation is available online at:
 cmake .. -DCMAKE_BUILD_TYPE=Release -DNFX_HASHING_BUILD_DOCUMENTATION=ON
 
 # Build the documentation
-cmake --build . --target documentation
+cmake --build . --target nfx-hashing-documentation
 ```
 
 #### Requirements

benchmark/CMakeLists.txt

@@ -15,17 +15,17 @@ endif()
 # Benchmarks source files
 #----------------------------------------------
 
-set(BENCHMARK_SOURCES)
+set(benchmark_sources)
 
-list(APPEND BENCHMARK_SOURCES
+list(APPEND benchmark_sources
 	BM_Hashing.cpp
 )
 
 #----------------------------------------------
 # Configure benchmark executables
 #----------------------------------------------
 
-foreach(benchmark_source ${BENCHMARK_SOURCES})
+foreach(benchmark_source ${benchmark_sources})
 	get_filename_component(benchmark_target_name ${benchmark_source} NAME_WE)
 	if(NOT TARGET ${benchmark_target_name})
 		add_executable(${benchmark_target_name} ${benchmark_source})

cmake/nfx-hashing-config.cmake.in

@@ -23,8 +23,6 @@ set(NFX_HASHING_VERSION_PATCH "@PROJECT_VERSION_PATCH@")
 set_and_check(NFX_HASHING_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
 set_and_check(NFX_HASHING_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
 
-# Our library dependencies (none - self-contained library)
-
 # Include the targets file
 include("${CMAKE_CURRENT_LIST_DIR}/nfx-hashing-targets.cmake")
 

cmake/nfxHashingBuildConfig.cmake

@@ -45,7 +45,7 @@ include(GNUInstallDirs)
 # Directory configuration
 #----------------------------------------------
 
-set(NFX_HASHING_DIR          "${PROJECT_SOURCE_DIR}"    CACHE PATH  "Root directory"   )
+set(NFX_HASHING_DIR          "${PROJECT_SOURCE_DIR}"       CACHE PATH  "Root directory"   )
 set(NFX_HASHING_INCLUDE_DIR  "${NFX_HASHING_DIR}/include"  CACHE PATH  "Include directory")
 
 #----------------------------------------------

cmake/nfxHashingDependencies.cmake

@@ -2,9 +2,9 @@
 # nfx-hashing - Dependencies configuration
 #==============================================================================
 
-#----------------------------
+#----------------------------------------------
 # Output configuration
-#----------------------------
+#----------------------------------------------
 
 set(_SAVED_CMAKE_REQUIRED_QUIET     ${CMAKE_REQUIRED_QUIET})
 set(_SAVED_CMAKE_MESSAGE_LOG_LEVEL  ${CMAKE_MESSAGE_LOG_LEVEL})
@@ -83,9 +83,9 @@ if(NFX_HASHING_BUILD_BENCHMARKS)
 	endif()
 endif()
 
-#----------------------------
+#----------------------------------------------
 # Dependency fetching
-#----------------------------
+#----------------------------------------------
 
 if(NFX_HASHING_BUILD_TESTS)
 	if(NOT GTest_FOUND)
@@ -99,9 +99,9 @@ if(NFX_HASHING_BUILD_BENCHMARKS)
 	endif()
 endif()
 
-#----------------------------
+#----------------------------------------------
 # Cleanup
-#----------------------------
+#----------------------------------------------
 
 set(CMAKE_REQUIRED_QUIET ${_SAVED_CMAKE_REQUIRED_QUIET})
 set(CMAKE_MESSAGE_LOG_LEVEL ${_SAVED_CMAKE_MESSAGE_LOG_LEVEL})

cmake/nfxHashingInstall.cmake

@@ -39,14 +39,14 @@ install(
 # Install library targets
 #----------------------------------------------
 
-set(INSTALL_TARGETS)
+set(install_targets)
 
 # Header-only interface library
-list(APPEND INSTALL_TARGETS ${PROJECT_NAME})
+list(APPEND install_targets ${PROJECT_NAME})
 
-if(INSTALL_TARGETS)
+if(install_targets)
 	install(
-		TARGETS ${INSTALL_TARGETS}
+		TARGETS ${install_targets}
 		EXPORT nfx-hashing-targets
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 			COMPONENT Development
@@ -113,13 +113,18 @@ install(
 install(
 	FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt"
 	DESTINATION "${CMAKE_INSTALL_DOCDIR}/licenses"
+	RENAME "LICENSE-${PROJECT_NAME}.txt"
 )
 
-install(
-	DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/licenses/"
-	DESTINATION "${CMAKE_INSTALL_DOCDIR}/licenses"
-	FILES_MATCHING PATTERN "LICENSE.txt-*"
-)
+file(GLOB LICENSE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/licenses/LICENSE-*")
+foreach(LICENSE_FILE ${LICENSE_FILES})
+	get_filename_component(LICENSE_NAME ${LICENSE_FILE} NAME)
+	install(
+		FILES ${LICENSE_FILE}
+		DESTINATION "${CMAKE_INSTALL_DOCDIR}/licenses"
+		RENAME "${LICENSE_NAME}.txt"
+	)
+endforeach()
 
 #----------------------------------------------
 # Install documentation
@@ -152,4 +157,4 @@ if(NFX_HASHING_BUILD_DOCUMENTATION)
 	endif()
 endif()
 
-message(STATUS "Installation configured for targets: ${INSTALL_TARGETS}")
+message(STATUS "Installation configured for targets: ${install_targets}")

cmake/nfxHashingPackaging.cmake

@@ -21,9 +21,9 @@ endif()
 
 # --- Detect processor count for parallel packaging ---
 include(ProcessorCount)
-ProcessorCount(N)
-if(NOT N EQUAL 0)
-	set(CPACK_THREADS ${N})
+ProcessorCount(processor_count)
+if(NOT processor_count EQUAL 0)
+	set(CPACK_THREADS ${processor_count})
 else()
 	set(CPACK_THREADS 1)
 endif()
@@ -90,6 +90,19 @@ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY  "nfx-hashing")
 # Platform-specific generators
 #----------------------------------------------
 
+# --- Find packaging tools ---
+if(UNIX AND NOT APPLE)
+	find_program(DPKG_CMD dpkg)
+	find_program(RPM_CMD rpm)
+endif()
+
+if(WIN32)
+	if(NOT WIX_CANDLE OR NOT WIX_LIGHT)
+		find_program(WIX_CANDLE NAMES candle.exe candle HINTS "$ENV{WIX}/bin")
+		find_program(WIX_LIGHT NAMES light.exe light HINTS "$ENV{WIX}/bin")
+	endif()
+endif()
+
 # --- Generators ---
 if(NOT DEFINED CPACK_GENERATOR)
 	set(CPACK_GENERATOR "")
@@ -105,7 +118,6 @@ if(NOT DEFINED CPACK_GENERATOR)
 
 	# --- DEB packages ---
 	if(NFX_HASHING_PACKAGE_DEB AND UNIX AND NOT APPLE)
-		find_program(DPKG_CMD dpkg)
 		if(DPKG_CMD)
 			set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
 		else()
@@ -115,7 +127,6 @@ if(NOT DEFINED CPACK_GENERATOR)
 
 	# --- RPM packages ---
 	if(NFX_HASHING_PACKAGE_RPM AND UNIX AND NOT APPLE)
-		find_program(RPM_CMD rpm)
 		if(RPM_CMD)
 			set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
 		else()
@@ -125,26 +136,11 @@ if(NOT DEFINED CPACK_GENERATOR)
 
 	# --- WiX packages ---
 	if(NFX_HASHING_PACKAGE_WIX AND WIN32)
-		if(NOT WIX_CANDLE OR NOT WIX_LIGHT)
-			set(WIX_SEARCH_PATHS
-				"C:/Program Files (x86)/WiX Toolset v3.14/bin"
-				"C:/Program Files (x86)/WiX Toolset v3.11/bin"
-				"C:/Program Files (x86)/WiX Toolset v3.10/bin"
-				"$ENV{WIX}bin"
-			)
-			
-			find_program(WIX_CANDLE NAMES candle.exe candle PATHS ${WIX_SEARCH_PATHS} NO_DEFAULT_PATH)
-			find_program(WIX_LIGHT NAMES light.exe light PATHS ${WIX_SEARCH_PATHS} NO_DEFAULT_PATH)
-		endif()
-		
 		if(WIX_CANDLE AND WIX_LIGHT)
 			set(CPACK_GENERATOR "${CPACK_GENERATOR};WIX")
 			message(STATUS "WiX found: ${WIX_CANDLE} - Windows MSI installer generation enabled")
 		else()
-			message(STATUS "WiX not found - install WiX Toolset v3.x for MSI installer support")
-			if(DEFINED WIX_SEARCH_PATHS)
-				message(STATUS "  Searched paths: ${WIX_SEARCH_PATHS}")
-			endif()
+			message(STATUS "WiX not found - install WiX Toolset and ensure WIX environment variable is set")
 		endif()
 	endif()
 
@@ -162,13 +158,12 @@ message(STATUS "  Output dir: ${CPACK_PACKAGE_DIRECTORY}")
 
 if("DEB" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
 	if(NOT DEFINED CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
-		find_program(DPKG_CMD dpkg)
 		if(DPKG_CMD)
 			execute_process(COMMAND ${DPKG_CMD} --print-architecture
-				OUTPUT_VARIABLE DETECTED_DEB_ARCH
+				OUTPUT_VARIABLE detected_deb_arch
 				OUTPUT_STRIP_TRAILING_WHITESPACE
 				ERROR_QUIET)
-			set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${DETECTED_DEB_ARCH}")
+			set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${detected_deb_arch}")
 		endif()
 	endif()
 
@@ -178,10 +173,10 @@ endif()
 if("RPM" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
 	if(NOT DEFINED CPACK_RPM_PACKAGE_ARCHITECTURE)
 		execute_process(COMMAND uname -m
-			OUTPUT_VARIABLE DETECTED_RPM_ARCH
+			OUTPUT_VARIABLE detected_rpm_arch
 			OUTPUT_STRIP_TRAILING_WHITESPACE
 			ERROR_QUIET)
-		set(CPACK_RPM_PACKAGE_ARCHITECTURE "${DETECTED_RPM_ARCH}")
+		set(CPACK_RPM_PACKAGE_ARCHITECTURE "${detected_rpm_arch}")
 	endif()
 
 	message(STATUS "RPM package architecture: ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
@@ -203,12 +198,6 @@ if("DEB" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
 	set(CPACK_DEBIAN_COMPRESSION_TYPE      "xz")
 	set(CPACK_DEBIAN_PACKAGE_PRIORITY      "optional")
 	set(CPACK_DEBIAN_PACKAGE_HOMEPAGE      ${CPACK_PACKAGE_HOMEPAGE_URL})
-	
-	# --- Core runtime dependencies  ---
-	set(DEB_DEPENDS "libc6, libstdc++6, libgcc-s1")
-	
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${DEB_DEPENDS}")
-	message(STATUS "DEB dependencies: ${CPACK_DEBIAN_PACKAGE_DEPENDS}")
 endif()
 
 # --- RPM package settings ---
@@ -225,12 +214,6 @@ if("RPM" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
 	set(CPACK_RPM_PACKAGE_VENDOR        ${CPACK_PACKAGE_VENDOR})
 	set(CPACK_RPM_PACKAGE_DESCRIPTION   ${PROJECT_DESCRIPTION})
 	set(CPACK_RPM_PACKAGE_URL           ${CPACK_PACKAGE_HOMEPAGE_URL})
-
-	# --- Core runtime dependencies ---
-	set(RPM_REQUIRES "glibc, libstdc++")
-	
-	set(CPACK_RPM_PACKAGE_REQUIRES "${RPM_REQUIRES}")
-	message(STATUS "RPM dependencies: ${CPACK_RPM_PACKAGE_REQUIRES}")
 endif()
 
 #----------------------------------------------

samples/CMakeLists.txt

@@ -15,9 +15,9 @@ endif()
 # Samples source files
 #----------------------------------------------
 
-set(SAMPLE_SOURCES)
+set(sample_sources)
 
-list(APPEND SAMPLE_SOURCES
+list(APPEND sample_sources
 	Sample_AdvancedHashing.cpp
 	Sample_Hash.cpp
 	Sample_Hasher.cpp
@@ -28,7 +28,7 @@ list(APPEND SAMPLE_SOURCES
 # Configure samples executables
 #----------------------------------------------
 
-foreach(sample_source ${SAMPLE_SOURCES})
+foreach(sample_source ${sample_sources})
 	get_filename_component(sample_target_name ${sample_source} NAME_WE)
 
 	if(NOT TARGET ${sample_target_name})

test/CMakeLists.txt

@@ -35,9 +35,9 @@ endif()
 # Tests source files
 #----------------------------------------------
 
-set(TEST_SOURCES)
+set(test_sources)
 
-list(APPEND TEST_SOURCES
+list(APPEND test_sources
 	TESTS_Hash.cpp
 	TESTS_HashAlgorithms.cpp
 	TESTS_HasherFunctor.cpp
@@ -48,7 +48,7 @@ list(APPEND TEST_SOURCES
 # Configure test executables
 #----------------------------------------------
 
-foreach(test_source ${TEST_SOURCES})
+foreach(test_source ${test_sources})
 	get_filename_component(test_target_name ${test_source} NAME_WE)
 
 	if(NOT TARGET ${test_target_name})