diff options
| author | glx22 <glx@openttd.org> | 2020-06-07 16:11:36 +0200 |
|---|---|---|
| committer | Charles Pigott <charlespigott@googlemail.com> | 2020-06-08 09:49:26 +0100 |
| commit | 0b86bd8b03a333b2c0a1900901c3535a188e475d (patch) | |
| tree | ccd000bccf721034263e0429154dcea8233bba86 | |
| parent | 1e01982a2e36b532d0bdf3768827eb7233b0ecee (diff) | |
| download | openttd-0b86bd8b03a333b2c0a1900901c3535a188e475d.tar.xz | |
Fix: CMake option values should be ON/OFF
| -rw-r--r-- | azure-pipelines/templates/release.yml | 2 | ||||
| -rw-r--r-- | azure-pipelines/templates/windows-build.yml | 2 | ||||
| -rw-r--r-- | cmake/Options.cmake | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/azure-pipelines/templates/release.yml b/azure-pipelines/templates/release.yml index 8a666ad5a..f6a00b7cf 100644 --- a/azure-pipelines/templates/release.yml +++ b/azure-pipelines/templates/release.yml @@ -91,7 +91,7 @@ jobs: VcpkgTargetTriplet: $(VcpkgTargetTriplet) BuildConfiguration: 'RelWithDebInfo' ${{ if eq(parameters.IsStableRelease, true) }}: - OptionUseNSIS: "YES" + OptionUseNSIS: "ON" - task: VSBuild@1 displayName: 'Create bundles' inputs: diff --git a/azure-pipelines/templates/windows-build.yml b/azure-pipelines/templates/windows-build.yml index 07e42a7ce..ae3b89414 100644 --- a/azure-pipelines/templates/windows-build.yml +++ b/azure-pipelines/templates/windows-build.yml @@ -2,7 +2,7 @@ parameters: BuildArch: '' VcpkgTargetTriplet: '' BuildConfiguration: '' - OptionUseNSIS: 'NO' + OptionUseNSIS: 'OFF' steps: - task: CMake@1 diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 51c8b7886..0e8063fac 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -41,16 +41,16 @@ endfunction() # function(set_options) if (UNIX AND NOT APPLE) - set(DEFAULT_OPTION_INSTALL_FHS YES) + set(DEFAULT_OPTION_INSTALL_FHS ON) else (UNIX AND NOT APPLE) - set(DEFAULT_OPTION_INSTALL_FHS NO) + set(DEFAULT_OPTION_INSTALL_FHS OFF) 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_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) + option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON) + option(OPTION_USE_THREADS "Use threads" ON) + option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" OFF) endfunction() # Show the values of the generic options. |