diff options
| author | glx22 <glx@openttd.org> | 2020-06-07 04:34:50 +0200 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2020-06-08 09:49:26 +0100 |
| commit | 3d766775948fefa9ffe6e564dce844b24e2f11e0 (patch) | |
| tree | ca45a86ac04eaf23f0eecf7c97111e2067c3aebd /cmake | |
| parent | f51e66f697e2956d57671afd90a57ca932356756 (diff) | |
| download | openttd-3d766775948fefa9ffe6e564dce844b24e2f11e0.tar.xz | |
Fix: Generate windows installer only for stable releases
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/InstallAndPackage.cmake | 7 | ||||
| -rw-r--r-- | cmake/Options.cmake | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake index 1994c0708..1cc539d2d 100644 --- a/cmake/InstallAndPackage.cmake +++ b/cmake/InstallAndPackage.cmake @@ -86,8 +86,11 @@ if (APPLE) set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macosx") elseif (WIN32) - set(CPACK_GENERATOR "ZIP;NSIS") - include(PackageNSIS) + set(CPACK_GENERATOR "ZIP") + if (OPTION_USE_NSIS) + list(APPEND CPACK_GENERATOR "NSIS") + include(PackageNSIS) + endif (OPTION_USE_NSIS) set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-windows-${CPACK_SYSTEM_NAME}") elseif (UNIX) diff --git a/cmake/Options.cmake b/cmake/Options.cmake index b292567f0..51c8b7886 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -50,6 +50,7 @@ function(set_options) option(OPTION_INSTALL_FHS "Install with Filesstem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS}) option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" YES) option(OPTION_USE_THREADS "Use threads" YES) + option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" NO) endfunction() # Show the values of the generic options. @@ -61,6 +62,7 @@ function(show_options) message(STATUS "Option Install FHS - ${OPTION_INSTALL_FHS}") message(STATUS "Option Use assert - ${OPTION_USE_ASSERTS}") message(STATUS "Option Use threads - ${OPTION_USE_THREADS}") + message(STATUS "Option Use NSIS - ${OPTION_USE_NSIS}") endfunction() # Add the definitions for the options that are selected. |