Skip to content

Commit 5baeacb

Browse files
committed
CMake: Allow overriding the CPack generator at configuration time
1 parent efb319f commit 5baeacb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

LSLCMake.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,23 +294,23 @@ macro(LSLGenerateCPackConfig)
294294
set(CPACK_PACKAGE_NAME lsl)
295295
set(CPACK_PACKAGE_VENDOR "Labstreaminglayer")
296296
if(APPLE)
297-
set(CPACK_GENERATOR "TBZ2")
297+
set(LSL_CPACK_DEFAULT_GEN TBZ2)
298298
if(DEFINED ENV{OSXVER})
299299
# Configured by Travis-CI for multi-osx builds.
300300
set(LSL_OS "$ENV{OSXVER}")
301301
else()
302302
set(LSL_OS "OSX${lslplatform}")
303303
endif(DEFINED ENV{OSXVER})
304304
elseif(WIN32)
305-
set(CPACK_GENERATOR ZIP) # you can create NSIS packages by calling 'cpack -G NSIS'
305+
set(LSL_CPACK_DEFAULT_GEN ZIP)
306306
set(CPACK_NSIS_MODIFY_PATH ON)
307307
set(CPACK_WIX_CMAKE_PACKAGE_REGISTRY ON)
308308
set(CPACK_WIX_UPGRADE_GUID "ee28a351-3b27-4c2b-8b48-259c87d1b1b4")
309309
set(CPACK_WIX_PROPERTY_ARPHELPLINK
310310
"https://labstreaminglayer.readthedocs.io/info/getting_started.html#getting-help")
311311
set(LSL_OS "Win${lslplatform}")
312312
elseif(UNIX)
313-
set(CPACK_GENERATOR DEB)
313+
set(LSL_CPACK_DEFAULT_GEN DEB)
314314
set(CPACK_SET_DESTDIR 1)
315315
set(CPACK_INSTALL_PREFIX "/usr")
316316
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Tristan Stenner <[email protected]>")
@@ -332,6 +332,7 @@ macro(LSLGenerateCPackConfig)
332332
endif()
333333
set(LSL_OS "Linux${lslplatform}-${LSB_RELEASE_CODENAME}")
334334
endif()
335+
set(CPACK_GENERATOR ${LSL_CPACK_DEFAULT_GEN} CACHE STRING "CPack pkg type(s) to generate")
335336
get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
336337
foreach(component ${CPACK_COMPONENTS_ALL})
337338
string(TOUPPER ${component} COMPONENT)

0 commit comments

Comments
 (0)