Skip to content

Commit

Permalink
Revert "Try suggested workaround."
Browse files Browse the repository at this point in the history
This reverts commit 914794a.

Signed-off-by: Bertrand Rix <bertrand.rix@artelys.com>
  • Loading branch information
obrix committed Jun 12, 2024
1 parent 914794a commit bd9ad38
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
5 changes: 0 additions & 5 deletions cpp/powsybl-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,4 @@ 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)

# Workaround for fixing the CI builds on Windows
# See https://github.com/actions/runner-images/issues/10004 for more details.
target_compile_definitions( powsybl-cpp
PRIVATE _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR )

target_link_libraries(powsybl-cpp PUBLIC ${PYPOWSYBL_JAVA_LIB})
6 changes: 0 additions & 6 deletions cpp/pypowsybl-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,4 @@ 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

# Workaround for fixing the CI builds on Windows
# See https://github.com/actions/runner-images/issues/10004 for more details.
target_compile_definitions( _pypowsybl
PRIVATE _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR )

target_link_libraries(_pypowsybl PRIVATE powsybl-cpp)

0 comments on commit bd9ad38

Please sign in to comment.