@@ -21,9 +21,9 @@ endif()
2121
2222# --- Detect processor count for parallel packaging ---
2323include (ProcessorCount)
24- ProcessorCount(N )
25- if (NOT N EQUAL 0)
26- set (CPACK_THREADS ${N } )
24+ ProcessorCount(processor_count )
25+ if (NOT processor_count EQUAL 0)
26+ set (CPACK_THREADS ${processor_count } )
2727else ()
2828 set (CPACK_THREADS 1)
2929endif ()
@@ -90,6 +90,12 @@ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "nfx-datetime")
9090# Platform-specific generators
9191#----------------------------------------------
9292
93+ # --- Find packaging tools ---
94+ if (UNIX AND NOT APPLE )
95+ find_program (DPKG_CMD dpkg)
96+ find_program (RPM_CMD rpm)
97+ endif ()
98+
9399# --- Generators ---
94100if (NOT DEFINED CPACK_GENERATOR)
95101 set (CPACK_GENERATOR "" )
@@ -105,7 +111,6 @@ if(NOT DEFINED CPACK_GENERATOR)
105111
106112 # --- DEB packages ---
107113 if (NFX_DATETIME_PACKAGE_DEB AND UNIX AND NOT APPLE )
108- find_program (DPKG_CMD dpkg)
109114 if (DPKG_CMD)
110115 set (CPACK_GENERATOR "${CPACK_GENERATOR} ;DEB" )
111116 else ()
@@ -115,7 +120,6 @@ if(NOT DEFINED CPACK_GENERATOR)
115120
116121 # --- RPM packages ---
117122 if (NFX_DATETIME_PACKAGE_RPM AND UNIX AND NOT APPLE )
118- find_program (RPM_CMD rpm)
119123 if (RPM_CMD)
120124 set (CPACK_GENERATOR "${CPACK_GENERATOR} ;RPM" )
121125 else ()
@@ -126,25 +130,15 @@ if(NOT DEFINED CPACK_GENERATOR)
126130 # --- WiX packages ---
127131 if (NFX_DATETIME_PACKAGE_WIX AND WIN32 )
128132 if (NOT WIX_CANDLE OR NOT WIX_LIGHT)
129- set (WIX_SEARCH_PATHS
130- "C:/Program Files (x86)/WiX Toolset v3.14/bin"
131- "C:/Program Files (x86)/WiX Toolset v3.11/bin"
132- "C:/Program Files (x86)/WiX Toolset v3.10/bin"
133- "$ENV{WIX} bin"
134- )
135-
136- find_program (WIX_CANDLE NAMES candle.exe candle PATHS ${WIX_SEARCH_PATHS} NO_DEFAULT_PATH)
137- find_program (WIX_LIGHT NAMES light.exe light PATHS ${WIX_SEARCH_PATHS} NO_DEFAULT_PATH)
133+ find_program (WIX_CANDLE NAMES candle.exe candle HINTS "$ENV{WIX} /bin" )
134+ find_program (WIX_LIGHT NAMES light.exe light HINTS "$ENV{WIX} /bin" )
138135 endif ()
139136
140137 if (WIX_CANDLE AND WIX_LIGHT)
141138 set (CPACK_GENERATOR "${CPACK_GENERATOR} ;WIX" )
142139 message (STATUS "WiX found: ${WIX_CANDLE} - Windows MSI installer generation enabled" )
143140 else ()
144- message (STATUS "WiX not found - install WiX Toolset v3.x for MSI installer support" )
145- if (DEFINED WIX_SEARCH_PATHS)
146- message (STATUS " Searched paths: ${WIX_SEARCH_PATHS} " )
147- endif ()
141+ message (STATUS "WiX not found - install WiX Toolset and ensure WIX environment variable is set" )
148142 endif ()
149143 endif ()
150144
@@ -162,13 +156,12 @@ message(STATUS " Output dir: ${CPACK_PACKAGE_DIRECTORY}")
162156
163157if ("DEB" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE )
164158 if (NOT DEFINED CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
165- find_program (DPKG_CMD dpkg)
166159 if (DPKG_CMD)
167160 execute_process (COMMAND ${DPKG_CMD} --print-architecture
168- OUTPUT_VARIABLE DETECTED_DEB_ARCH
161+ OUTPUT_VARIABLE detected_deb_arch
169162 OUTPUT_STRIP_TRAILING_WHITESPACE
170163 ERROR_QUIET)
171- set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${DETECTED_DEB_ARCH } " )
164+ set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${detected_deb_arch } " )
172165 endif ()
173166 endif ()
174167
@@ -178,10 +171,10 @@ endif()
178171if ("RPM" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE )
179172 if (NOT DEFINED CPACK_RPM_PACKAGE_ARCHITECTURE)
180173 execute_process (COMMAND uname -m
181- OUTPUT_VARIABLE DETECTED_RPM_ARCH
174+ OUTPUT_VARIABLE detected_rpm_arch
182175 OUTPUT_STRIP_TRAILING_WHITESPACE
183176 ERROR_QUIET)
184- set (CPACK_RPM_PACKAGE_ARCHITECTURE "${DETECTED_RPM_ARCH } " )
177+ set (CPACK_RPM_PACKAGE_ARCHITECTURE "${detected_rpm_arch } " )
185178 endif ()
186179
187180 message (STATUS "RPM package architecture: ${CPACK_RPM_PACKAGE_ARCHITECTURE} " )
@@ -194,7 +187,7 @@ endif()
194187# --- DEB package settings ---
195188if ("DEB" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE )
196189 set (CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME} )
197- set (CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
190+ set (CPACK_DEBIAN_FILE_NAME " DEB-DEFAULT" )
198191 set (CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION} )
199192 set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE} )
200193 set (CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_VENDOR} )
@@ -205,9 +198,9 @@ if("DEB" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
205198 set (CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL} )
206199
207200 # --- Core runtime dependencies ---
208- set (DEB_DEPENDS "libc6, libstdc++6, libgcc-s1" )
201+ set (deb_depends "libc6, libstdc++6, libgcc-s1" )
209202
210- set (CPACK_DEBIAN_PACKAGE_DEPENDS "${DEB_DEPENDS } " )
203+ set (CPACK_DEBIAN_PACKAGE_DEPENDS "${deb_depends } " )
211204 message (STATUS "DEB dependencies: ${CPACK_DEBIAN_PACKAGE_DEPENDS} " )
212205endif ()
213206
@@ -227,9 +220,9 @@ if("RPM" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
227220 set (CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_HOMEPAGE_URL} )
228221
229222 # --- Core runtime dependencies ---
230- set (RPM_REQUIRES "glibc, libstdc++" )
223+ set (rpm_requires "glibc, libstdc++" )
231224
232- set (CPACK_RPM_PACKAGE_REQUIRES "${RPM_REQUIRES } " )
225+ set (CPACK_RPM_PACKAGE_REQUIRES "${rpm_requires } " )
233226 message (STATUS "RPM dependencies: ${CPACK_RPM_PACKAGE_REQUIRES} " )
234227endif ()
235228
0 commit comments