Fix MSVC runtime binaries incompatibility issues (#803)

Signed-off-by: Bertrand Rix <bertrand.rix@artelys.com>
powsybl · Jul 16, 2024 · 2893857 · 2893857
1 parent 7d80cfe
commit 2893857
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/cpp/powsybl-cpp/CMakeLists.txt b/cpp/powsybl-cpp/CMakeLists.txt
@@ -7,6 +7,12 @@
 cmake_minimum_required(VERSION 3.14)
 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")
+endif()
+
 include(ExternalProject)
 
 set(POWSYBL_CPP_LIB ${CMAKE_SHARED_LIBRARY_PREFIX}powsybl-cpp${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -95,4 +101,11 @@ if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
  add_custom_command(TARGET powsybl-cpp POST_BUILD ${POWSYBL_CPP_INSTALL_EXTRA_COMMAND} COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:powsybl-cpp> ${PYPOWSYBL_JAVA_BIN_DIR}/${PYPOWSYBL_JAVA_LIB} ${CMAKE_CURRENT_BINARY_DIR}/${POWSYBL_MATH_NATIVE_JAR_ENTRY_DIR}/${POWSYBL_MATH_NATIVE_LIB} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 endif(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
 
+# Fix related to issue describred here https://github.com/actions/runner-images/issues/10004#issuecomment-2156109231
+# Should fix incompatibility between MSVC runtime 14.40.XXX and previous version
+if(MSVC)
+ target_compile_definitions(powsybl-cpp
+ PRIVATE _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+endif()
+
 target_link_libraries(powsybl-cpp PUBLIC ${PYPOWSYBL_JAVA_LIB})
diff --git a/cpp/pypowsybl-cpp/CMakeLists.txt b/cpp/pypowsybl-cpp/CMakeLists.txt
@@ -7,6 +7,12 @@
 cmake_minimum_required(VERSION 3.14)
 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")
+endif()
+
 set(POWSYBL_CPP_SOURCE_DIR "../powsybl-cpp")
 set(PYPOWSYBL_JAVA_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/../java)
 include_directories(${POWSYBL_CPP_SOURCE_DIR} ${PYPOWSYBL_JAVA_BIN_DIR})
@@ -16,4 +22,12 @@ pybind11_add_module(_pypowsybl pylogging.cpp bindings.cpp)
 
 add_dependencies(_pypowsybl native-image math-native)
 add_dependencies(math-native native-image) # because mvn command also copy math native jar
+
+# Fix related to issue describred here https://github.com/actions/runner-images/issues/10004#issuecomment-2156109231
+# Should fix incompatibility between MSVC runtime 14.40.XXX and previous version
+if(MSVC)
+ target_compile_definitions(_pypowsybl
+ PRIVATE _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+endif()
+
 target_link_libraries(_pypowsybl PRIVATE powsybl-cpp)