Add flag to disable MT flag usage.

Signed-off-by: Bertrand Rix <bertrand.rix@artelys.com>
powsybl · Jul 23, 2024 · 4362f74 · 4362f74
1 parent 6f1edca
commit 4362f74
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/cpp/powsybl-cpp/CMakeLists.txt b/cpp/powsybl-cpp/CMakeLists.txt
@@ -9,8 +9,10 @@ project(powsybl-cpp)
 
 # Enable static linkage to prevent any future runtime binary compatibility issue
 if(MSVC)
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+  if(USE_MSVC_MT_FLAG)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+  endif()
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif()
 

diff --git a/cpp/pypowsybl-cpp/CMakeLists.txt b/cpp/pypowsybl-cpp/CMakeLists.txt
@@ -9,8 +9,10 @@ project(pypowsybl-cpp)
 
 # Enable static linkage to prevent any future runtime binary compatibility issue
 if(MSVC)
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+  if(USE_MSVC_MT_FLAG)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+  endif()
 endif()
 
 set(POWSYBL_CPP_SOURCE_DIR "../powsybl-cpp")

diff --git a/setup.py b/setup.py
@@ -44,7 +44,8 @@ def build_extension(self, ext):
         if not extdir.endswith(os.path.sep):
             extdir += os.path.sep
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
-                      '-DPYTHON_EXECUTABLE=' + sys.executable]
+                      '-DPYTHON_EXECUTABLE=' + sys.executable,
+                      '-DUSE_MSVC_MT_FLAG=True']
 
         cfg = 'Debug' if self.debug else 'Release'
         build_args = ['--config', cfg]