|
| 1 | +From 7b26c01bbe1586afc19e123ea6d1bb1afd747069 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Silvio Traversaro <silvio@traversaro.it> |
| 3 | +Date: Wed, 13 Nov 2024 19:09:58 +0100 |
| 4 | +Subject: [PATCH 1/2] Add BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY option |
| 5 | + |
| 6 | +--- |
| 7 | + CMakeLists.txt | 4 +++- |
| 8 | + 1 file changed, 3 insertions(+), 1 deletion(-) |
| 9 | + |
| 10 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 11 | +index 899d057..c2db1a5 100644 |
| 12 | +--- a/CMakeLists.txt |
| 13 | ++++ b/CMakeLists.txt |
| 14 | +@@ -38,6 +38,8 @@ option(BUILD_MCMODELLARGE "Build the library linked with mcmodel=large flag, use |
| 15 | + option(BUILD_LICCHECK_PRINT "Build libraries with licence check flag" OFF) |
| 16 | + option(BUILD_DYNRT_LIBS "Build the libraries linked against the dynamic runtime (windows only)" OFF) |
| 17 | + option(BUILD_MT_LIBS "Build the multithreaded library" OFF) |
| 18 | ++option(BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY "If ON, do not manually set MSVC_RUNTIME_LIBRARY property" OFF) |
| 19 | ++mark_as_advanced(BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY) |
| 20 | + option(BUILD_CPP "Build the cpp interface" OFF) |
| 21 | + option(BUILD_F2C "Build the f2c library" OFF) |
| 22 | + if (${CMAKE_VERSION} VERSION_LESS "3.9.0") |
| 23 | +@@ -346,7 +348,7 @@ macro(createSingleASL name sourcedir sources) |
| 24 | + if(NOT WIN32) |
| 25 | + target_link_libraries(${name} PRIVATE m) |
| 26 | + endif() |
| 27 | +- if(MSVC) |
| 28 | ++ if(MSVC AND NOT BUILD_WITH_DEFAULT_MSVC_RUNTIME_LIBRARY) |
| 29 | + if(${name} MATCHES "dynrt") |
| 30 | + set_property(TARGET ${name} PROPERTY |
| 31 | + MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL") |
| 32 | + |
| 33 | +From 3e1987ac6eb3ccb017f5ec348a9b6fcc9ccb7826 Mon Sep 17 00:00:00 2001 |
| 34 | +From: Silvio Traversaro <silvio@traversaro.it> |
| 35 | +Date: Wed, 13 Nov 2024 19:32:25 +0100 |
| 36 | +Subject: [PATCH 2/2] Update CMakeLists.txt |
| 37 | + |
| 38 | +--- |
| 39 | + CMakeLists.txt | 2 ++ |
| 40 | + 1 file changed, 2 insertions(+) |
| 41 | + |
| 42 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 43 | +index c2db1a5..f7891ce 100644 |
| 44 | +--- a/CMakeLists.txt |
| 45 | ++++ b/CMakeLists.txt |
| 46 | +@@ -356,6 +356,8 @@ macro(createSingleASL name sourcedir sources) |
| 47 | + set_property(TARGET ${name} PROPERTY |
| 48 | + MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") |
| 49 | + endif() |
| 50 | ++ endif() |
| 51 | ++ if(MSVC) |
| 52 | + target_compile_options(${name} PRIVATE |
| 53 | + /wd4013 /wd4018 /wd4101 /wd4244 /wd4273 /wd4267 /wd4996) |
| 54 | + else() |
0 commit comments