Skip to content

Commit b741493

Browse files
authored
Create pypowsybl-parent (#931)
Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
1 parent 6da6570 commit b741493

File tree

351 files changed

+540
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+540
-502
lines changed

cpp/pypowsybl-java/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ macro(extract_and_install_native_lib jar_file jar_entry library_file)
4444
endif()
4545
endmacro()
4646

47-
set(math-native-jar ${PYPOWSYBL_JAVA_SRC_DIR}/target/dependency/powsybl-math-native.jar)
48-
set(ortools-jar ${PYPOWSYBL_JAVA_SRC_DIR}/target/dependency/ortools-${CMAKE_SYSTEM_NAME}-${ARCH_ID}.jar)
47+
set(math-native-jar ${PYPOWSYBL_JAVA_SRC_DIR}/pypowsybl/target/dependency/powsybl-math-native.jar)
48+
set(ortools-jar ${PYPOWSYBL_JAVA_SRC_DIR}/pypowsybl/target/dependency/ortools-${CMAKE_SYSTEM_NAME}-${ARCH_ID}.jar)
4949

5050
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
5151
extract_and_install_native_lib(${math-native-jar} natives/windows_${OS_BITS} math.dll)
@@ -93,7 +93,7 @@ ExternalProject_Add(native-image
9393
DEPENDS mvn
9494
SOURCE_DIR ${PYPOWSYBL_JAVA_BIN_DIR}
9595
DOWNLOAD_COMMAND ""
96-
PATCH_COMMAND $ENV{JAVA_HOME}/bin/native-image ${NATIVE_IMAGE_BUILD_OPTIONS} --class-path ${PYPOWSYBL_JAVA_SRC_DIR}/target/pypowsybl-java.jar${EXTRA_JARS} -march=compatibility --no-fallback --shared --gc=${NATIVE_IMAGE_GC} -H:Name=pypowsybl-java -H:CLibraryPath=${CMAKE_CURRENT_SOURCE_DIR}
96+
PATCH_COMMAND $ENV{JAVA_HOME}/bin/native-image ${NATIVE_IMAGE_BUILD_OPTIONS} --class-path ${PYPOWSYBL_JAVA_SRC_DIR}/pypowsybl/target/pypowsybl-java.jar${EXTRA_JARS} -march=compatibility --no-fallback --shared --gc=${NATIVE_IMAGE_GC} -H:Name=pypowsybl-java -H:CLibraryPath=${CMAKE_CURRENT_SOURCE_DIR}
9797
CONFIGURE_COMMAND ""
9898
BUILD_COMMAND ""
9999
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${PYPOWSYBL_JAVA_BIN_DIR}/${PYPOWSYBL_JAVA_OLD_LIB} ${PYPOWSYBL_JAVA_BIN_DIR}/${PYPOWSYBL_JAVA_LIB} ${NATIVE_IMAGE_INSTALL_EXTRA_COMMAND}

0 commit comments

Comments
 (0)