cpp/openttd-patchpack/source Changeset - r24257:fcaa8490c179

Changeset - r24257:fcaa8490c179

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

glx22 - 4 years ago 2020-06-07 14:11:36
glx@openttd.org

Fix: CMake option values should be ON/OFF

3 files changed with 8 insertions and 8 deletions:

azure-pipelines/templates/release.yml

azure-pipelines/templates/windows-build.yml

cmake/Options.cmake

0 comments (0 inline, 0 general)

azure-pipelines/templates/release.yml

➞

Show inline comments

@@ @@ -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:

azure-pipelines/templates/windows-build.yml

➞

Show inline comments

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

cmake/Options.cmake

➞

Show inline comments

@@ @@ -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.

0 comments (0 inline, 0 general)