@@ -123,20 +123,19 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
123123 }
124124
125125 # Define CMake Generator arguments
126- $cMakeOptions = " -DCMAKE_SYSTEM_NAME=$systemName " , " -DCMAKE_BUILD_TYPE=$configuration "
126+ $cMakeOptions = " -DCMAKE_SYSTEM_NAME=$systemName " , " -DCMAKE_BUILD_TYPE=$configuration " , " -DBUILD_SHARED_LIBS=OFF "
127127 $submoduleCMakeOptions = @ {
128128 ' ENTT' = @ (" -DENTT_INCLUDE_HEADERS=ON" )
129- ' SPDLOG' = @ (" -DSPDLOG_BUILD_SHARED=OFF" , " -DBUILD_STATIC_LIBS=ON " , " - DSPDLOG_FMT_EXTERNAL=ON" , " -DSPDLOG_FMT_EXTERNAL_HO=OFF" );
130- ' GLFW ' = @ (" -DGLFW_BUILD_DOCS=OFF" , " -DGLFW_INSTALL=OFF" );
131- ' ASSIMP' = @ (" -DASSIMP_BUILD_TESTS=OFF" , " -DASSIMP_INSTALL=OFF" , " -DASSIMP_BUILD_SAMPLES=OFF" , " -DASSIMP_BUILD_ASSIMP_TOOLS=OFF" , " -DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=OFF" , " -DASSIMP_BUILD_OBJ_IMPORTER=ON" , " -DASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT=OFF" , " -DASSIMP_BUILD_OBJ_EXPORTER=ON" , " -DBUILD_SHARED_LIBS=OFF " );
129+ ' SPDLOG' = @ (" -DSPDLOG_BUILD_SHARED=OFF" , " -DSPDLOG_FMT_EXTERNAL=ON" , " -DSPDLOG_FMT_EXTERNAL_HO=OFF" );
130+ ' GLFW ' = @ (" -DGLFW_BUILD_DOCS=OFF" , " -DGLFW_INSTALL=OFF" , " -DGLFW_BUILD_WAYLAND=OFF " );
131+ ' ASSIMP' = @ (" -DASSIMP_BUILD_TESTS=OFF" , " -DASSIMP_INSTALL=OFF" , " -DASSIMP_BUILD_SAMPLES=OFF" , " -DASSIMP_BUILD_ASSIMP_TOOLS=OFF" , " -DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=OFF" , " -DASSIMP_BUILD_OBJ_IMPORTER=ON" , " -DASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT=OFF" , " -DASSIMP_BUILD_OBJ_EXPORTER=ON" );
132132 ' STDUUID' = @ (" -DUUID_BUILD_TESTS=OFF" , " -DUUID_USING_CXX20_SPAN=ON" , " -DUUID_SYSTEM_GENERATOR=OFF" );
133133 ' YAMLCPP' = @ (" -DYAML_CPP_BUILD_TOOLS=OFF" , " -DYAML_CPP_BUILD_TESTS=OFF" , " -DYAML_CPP_FORMAT_SOURCE=OFF" , " -DYAML_BUILD_SHARED_LIBS=OFF" );
134134 ' FRAMEWORK' = @ (" -DBUILD_FRAMEWORK=ON" );
135135 ' VULKAN_LOADER' = @ (" -DVULKAN_HEADERS_INSTALL_DIR=$ExternalVulkanHeadersInstallDir " , " -DUSE_MASM=OFF" , " -DUSE_GAS=OFF" )
136136 ' SPIRV_TOOLS' = @ (" -DSPIRV_SKIP_EXECUTABLES=ON" , " -DSPIRV_SKIP_TESTS=ON" , " -DSPIRV_WERROR=OFF" )
137137 ' SPIRV_CROSS' = @ (" -DSPIRV_CROSS_ENABLE_TESTS=OFF" )
138138 ' LAUNCHER_ONLY' = @ (" -DLAUNCHER_ONLY=ON" )
139- # 'GLM' = @("-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
140139 }
141140
142141 $cMakeCacheVariableOverride = $cMakeOptions -join ' '
@@ -146,7 +145,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
146145 " Windows" {
147146 switch ($VsVersion ) {
148147 2022 {
149- $cMakeGenerator = " -G `" Visual Studio 17 2022`" -A $architecture "
148+ $cMakeGenerator = " `" Visual Studio 17 2022`" -A $architecture "
150149 }
151150 Default {
152151 throw ' This version of Visual Studio is not supported'
@@ -155,10 +154,10 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
155154 $cMakeCacheVariableOverride += ' -DCMAKE_CONFIGURATION_TYPES=Debug;Release '
156155 }
157156 " Linux" {
158- $cMakeGenerator = " -G Ninja"
157+ $cMakeGenerator = " Ninja"
159158 }
160159 " Darwin" {
161- $cMakeGenerator = " -G `" Xcode`" "
160+ $cMakeGenerator = " Xcode"
162161 $cMakeCacheVariableOverride += ' ' + $submoduleCMakeOptions.FRAMEWORK -join ' '
163162 }
164163 Default {
@@ -181,7 +180,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
181180 $cMakeCacheVariableOverride += ' ' + $submoduleCMakeOptions.GLM -join ' '
182181 }
183182
184- $cMakeArguments = " -S $repositoryRootPath -B $buildDirectoryPath $cMakeGenerator $cMakeCacheVariableOverride "
183+ $cMakeArguments = " -S $repositoryRootPath -B $buildDirectoryPath -G $cMakeGenerator $cMakeCacheVariableOverride "
185184
186185 # CMake Generation process
187186 Write-Host $cMakeArguments
0 commit comments