conan_provider.cmake: fix missing runtime type detection for ClangCL

valgur · Sep 30, 2024 · b19fa02 · b19fa02
1 parent 035940c
commit b19fa02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/cmake/SetDefaultProfile.cmake b/cmake/SetDefaultProfile.cmake
@@ -9,11 +9,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(MSVC AND NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
-    if(BUILD_SHARED_LIBS)
-        # shared spdlog requires MultiThreadedDLL
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-    else()
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    endif()
-    message(STATUS "CMAKE_MSVC_RUNTIME_LIBRARY not set, using ${CMAKE_MSVC_RUNTIME_LIBRARY}")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 endif()
diff --git a/cmake/conan_provider.cmake b/cmake/conan_provider.cmake
@@ -214,9 +214,7 @@ function(detect_compiler COMPILER COMPILER_VERSION COMPILER_RUNTIME COMPILER_RUN
     message(STATUS "CMake-Conan: CMake compiler=${_COMPILER}")
     message(STATUS "CMake-Conan: CMake compiler version=${_COMPILER_VERSION}")
 
-    if(_COMPILER MATCHES MSVC)
-        set(_COMPILER "msvc")
-        string(SUBSTRING ${MSVC_VERSION} 0 3 _COMPILER_VERSION)
+    if(MSVC)
         # Configure compiler.runtime and compiler.runtime_type settings for MSVC
         if(CMAKE_MSVC_RUNTIME_LIBRARY)
             set(_msvc_runtime_library ${CMAKE_MSVC_RUNTIME_LIBRARY})
@@ -252,9 +250,11 @@ function(detect_compiler COMPILER COMPILER_VERSION COMPILER_RUNTIME COMPILER_RUN
             endif()
             message(STATUS "CMake-Conan: CMake compiler.runtime_type=${_COMPILER_RUNTIME_TYPE}")
         endif()
+    endif()
 
-        unset(_KNOWN_MSVC_RUNTIME_VALUES)
-
+    if(_COMPILER MATCHES MSVC)
+        set(_COMPILER "msvc")
+        string(SUBSTRING ${MSVC_VERSION} 0 3 _COMPILER_VERSION)
     elseif(_COMPILER MATCHES AppleClang)
         set(_COMPILER "apple-clang")
         string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION})