diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6211ece7..fc44885d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [ main, MSVCCompilerFlags ] + branches: [ main ] pull_request: - branches: [ main, MSVCCompilerFlags ] + branches: [ main ] jobs: build-and-test: diff --git a/CMakeLists.txt b/CMakeLists.txt index 63389b43..6734db71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ if(UNIX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -fPIC") elseif(MSVC) # Skip warning for invalid conversion from size_t to uint32_t for all targets below for now - add_compile_options ("/wd4267" "/utf-8") + add_compile_options("/wd4267" "/utf-8") elseif(WIN32) add_compile_definitions(_CRT_SECURE_NO_WARNINGS) endif() diff --git a/CMakePresets.json b/CMakePresets.json index a5aca913..26028759 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -37,13 +37,19 @@ "name": "ci-macos-13", "displayName": "CI configure step for MacOS", "description": "Same as default, Used in GitHub actions workflow", - "inherits": "default" + "inherits": "default", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } }, { "name": "debug-macos-13", "displayName": "Debug configure step for MacOS", "description": "Used to generate debug configuration for MacOS", - "inherits": "default" + "inherits": "default", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } }, { "name": "ci-windows-2022", @@ -129,6 +135,7 @@ "configurePreset": "ci-macos-13", "displayName": "MacOS CI Build", "description": "This preset is used by the CI build on MacOS", + "configuration": "Release", "jobs": 2 }, { @@ -136,6 +143,7 @@ "configurePreset": "debug-macos-13", "displayName": "MacOS Debug Build", "description": "This preset is used to debug the build on MacOS", + "configuration": "Debug", "jobs": 2 } ], @@ -183,7 +191,7 @@ "configurePreset": "ci-windows-2022", "displayName": "CI Tests on windows", "description": "Runs all tests on a windows configuration", - "configuration": "RelWithDebInfo", + "configuration": "Release", "execution": { "jobs": 2 },