TEMP: test MSVC runtime libraries

bbc · Oct 6, 2023 · 0d62208 · 0d62208
1 parent 54a4503
commit 0d62208
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -8,40 +8,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubuntu
-            os: ubuntu-latest
-            cmake_config_args: >-
-              -DCMAKE_BUILD_TYPE=Debug
-              -DBMX_BUILD_WITH_LIBCURL=ON
-          - name: ubuntu-valgrind
-            os: ubuntu-latest
-            apt_installs: >-
-              valgrind
-            cmake_config_args: >-
-              -DCMAKE_BUILD_TYPE=Debug
-              -DBMX_BUILD_WITH_LIBCURL=ON
-              -DBMX_TEST_WITH_VALGRIND=ON
-              -DLIBMXF_TEST_WITH_VALGRIND=ON
-              -DLIBMXFPP_TEST_WITH_VALGRIND=ON
-          - name: macos-brew
-            os: macos-latest
+          - name: windows MD
+            os: windows-latest
             cmake_config_args: >-
-              -DCMAKE_BUILD_TYPE=Debug
-              -DBMX_BUILD_WITH_LIBCURL=ON
-          - name: macos-xcode-universal
-            os: macos-latest
+              -BMX_SET_MSVC_RUNTIME=MD
+            cmake_build_args: >-
+              --config Debug
+            cmake_test_args: >-
+              -C Debug
+          - name: windows MT
+            os: windows-latest
             cmake_config_args: >-
-              -G Xcode
-              -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-              -DBUILD_SHARED_LIBS=OFF
-              -DBMX_BUILD_URIPARSER_SOURCE=ON
-              -DBMX_BUILD_WITH_LIBCURL=ON
+              -BMX_SET_MSVC_RUNTIME=MT
             cmake_build_args: >-
               --config Debug
             cmake_test_args: >-
               -C Debug
-          - name: windows
+          - name: windows default
             os: windows-latest
+            cmake_config_args: >-
+              -BMX_SET_MSVC_RUNTIME=default
             cmake_build_args: >-
               --config Debug
             cmake_test_args: >-

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,8 +17,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/options.cmake")
 if(MSVC AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.15.0)
     if(BMX_SET_MSVC_RUNTIME STREQUAL "MD")
         set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        message("-- Setting MSVC MD 3.15")
     elseif(BMX_SET_MSVC_RUNTIME STREQUAL "MT")
         set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+        message("-- Setting MSVC MT 3.15")
     endif()
 endif()