Skip to content

Commit a64d72b

Browse files
chore(cmake): remove redundant system dependencies from packages
1 parent 74a6675 commit a64d72b

1 file changed

Lines changed: 12 additions & 24 deletions

File tree

cmake/nfxDataTypePackaging.cmake

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,13 @@ if(UNIX AND NOT APPLE)
9696
find_program(RPM_CMD rpm)
9797
endif()
9898

99+
if(WIN32)
100+
if(NOT WIX_CANDLE OR NOT WIX_LIGHT)
101+
find_program(WIX_CANDLE NAMES candle.exe candle HINTS "$ENV{WIX}/bin")
102+
find_program(WIX_LIGHT NAMES light.exe light HINTS "$ENV{WIX}/bin")
103+
endif()
104+
endif()
105+
99106
# --- Generators ---
100107
if(NOT DEFINED CPACK_GENERATOR)
101108
set(CPACK_GENERATOR "")
@@ -129,11 +136,6 @@ if(NOT DEFINED CPACK_GENERATOR)
129136

130137
# --- WiX packages ---
131138
if(NFX_DATATYPES_PACKAGE_WIX AND WIN32)
132-
if(NOT WIX_CANDLE OR NOT WIX_LIGHT)
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")
135-
endif()
136-
137139
if(WIX_CANDLE AND WIX_LIGHT)
138140
set(CPACK_GENERATOR "${CPACK_GENERATOR};WIX")
139141
message(STATUS "WiX found: ${WIX_CANDLE} - Windows MSI installer generation enabled")
@@ -170,13 +172,11 @@ endif()
170172

171173
if("RPM" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
172174
if(NOT DEFINED CPACK_RPM_PACKAGE_ARCHITECTURE)
173-
if(RPM_CMD)
174-
execute_process(COMMAND uname -m
175-
OUTPUT_VARIABLE detected_rpm_arch
176-
OUTPUT_STRIP_TRAILING_WHITESPACE
177-
ERROR_QUIET)
178-
set(CPACK_RPM_PACKAGE_ARCHITECTURE "${detected_rpm_arch}")
179-
endif()
175+
execute_process(COMMAND uname -m
176+
OUTPUT_VARIABLE detected_rpm_arch
177+
OUTPUT_STRIP_TRAILING_WHITESPACE
178+
ERROR_QUIET)
179+
set(CPACK_RPM_PACKAGE_ARCHITECTURE "${detected_rpm_arch}")
180180
endif()
181181

182182
message(STATUS "RPM package architecture: ${CPACK_RPM_PACKAGE_ARCHITECTURE}")
@@ -198,12 +198,6 @@ if("DEB" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
198198
set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
199199
set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
200200
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL})
201-
202-
# --- Core runtime dependencies ---
203-
set(deb_depends "libc6, libstdc++6, libgcc-s1")
204-
205-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${deb_depends}")
206-
message(STATUS "DEB dependencies: ${CPACK_DEBIAN_PACKAGE_DEPENDS}")
207201
endif()
208202

209203
# --- RPM package settings ---
@@ -220,12 +214,6 @@ if("RPM" IN_LIST CPACK_GENERATOR AND UNIX AND NOT APPLE)
220214
set(CPACK_RPM_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR})
221215
set(CPACK_RPM_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
222216
set(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_HOMEPAGE_URL})
223-
224-
# --- Core runtime dependencies ---
225-
set(rpm_requires "glibc, libstdc++")
226-
227-
set(CPACK_RPM_PACKAGE_REQUIRES "${rpm_requires}")
228-
message(STATUS "RPM dependencies: ${CPACK_RPM_PACKAGE_REQUIRES}")
229217
endif()
230218

231219
#----------------------------------------------

0 commit comments

Comments
 (0)