mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: CMake option values should be ON/OFF

pull/8209/head
glx22 2020-06-07 16:11:36 +02:00 committed by Charles Pigott
parent 1e01982a2e
commit 0b86bd8b03
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure-pipelines/templates/release.yml
View File

@ -91,7 +91,7 @@ jobs:
VcpkgTargetTriplet: $(VcpkgTargetTriplet) VcpkgTargetTriplet: $(VcpkgTargetTriplet)
BuildConfiguration: 'RelWithDebInfo' BuildConfiguration: 'RelWithDebInfo'
${{ if eq(parameters.IsStableRelease, true) }}: ${{ if eq(parameters.IsStableRelease, true) }}:
OptionUseNSIS: "YES" OptionUseNSIS: "ON"
- task: VSBuild@1 - task: VSBuild@1
displayName: 'Create bundles' displayName: 'Create bundles'
inputs: inputs:

2
azure-pipelines/templates/windows-build.yml
View File

@ -2,7 +2,7 @@ parameters:
BuildArch: '' BuildArch: ''
VcpkgTargetTriplet: '' VcpkgTargetTriplet: ''
BuildConfiguration: '' BuildConfiguration: ''
OptionUseNSIS: 'NO' OptionUseNSIS: 'OFF'
steps: steps:
- task: CMake@1 - task: CMake@1

12
cmake/Options.cmake
View File

@ -41,16 +41,16 @@ endfunction()
# #
function(set_options) function(set_options)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
set(DEFAULT_OPTION_INSTALL_FHS YES) set(DEFAULT_OPTION_INSTALL_FHS ON)
else (UNIX AND NOT APPLE) else (UNIX AND NOT APPLE)
set(DEFAULT_OPTION_INSTALL_FHS NO) set(DEFAULT_OPTION_INSTALL_FHS OFF)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)
option(OPTION_DEDICATED "Build dedicated server only (no GUI)" NO) option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF)
option(OPTION_INSTALL_FHS "Install with Filesstem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS}) 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_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON)
option(OPTION_USE_THREADS "Use threads" YES) option(OPTION_USE_THREADS "Use threads" ON)
option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" NO) option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" OFF)
endfunction() endfunction()
# Show the values of the generic options. # Show the values of the generic options.