Skip to content

Commit

Permalink
Add missing check on target and put headers directly in include.
Browse files Browse the repository at this point in the history
Signed-off-by: Bertrand Rix <[email protected]>
  • Loading branch information
obrix committed Aug 2, 2024
1 parent 8d59b94 commit c765fd2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions cpp/pypowsybl-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ include_directories(${POWSYBL_CPP_SOURCE_DIR} ${PYPOWSYBL_JAVA_SOURCE_DIR} ${PYP
link_directories(${PYPOWSYBL_JAVA_LIBRARY_DIR})
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
if (TARGET native-image)
add_dependencies(_pypowsybl native-image math-native)
endif()

# 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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def zipHeadersAndBinaries(self, binary_dir, cpp_source_dir):
for lib in binaries['lib']:
archive.write(lib, arcname=os.path.join('lib', os.path.basename(lib)))
for include in includes:
archive.write(include, arcname=os.path.join('include/powsybl-cpp', os.path.basename(include)))
archive.write(include, arcname=os.path.join('include', os.path.basename(include)))


setup(
Expand Down

0 comments on commit c765fd2

Please sign in to comment.