diff --git a/Applications/Python/CMakeLists.txt b/Applications/Python/CMakeLists.txt index 0d6bb59652c8494e4e2a8ae5af7951ab4928c610..98801e4cf44b521c5b5406437fc3deaf5b4b7220 100644 --- a/Applications/Python/CMakeLists.txt +++ b/Applications/Python/CMakeLists.txt @@ -14,8 +14,4 @@ endif() target_link_libraries(_cli PRIVATE ApplicationsLib BaseLib GitInfoLib tclap) target_include_directories(_cli PRIVATE ../CLI) -set(_cli_dest ${CMAKE_INSTALL_LIBDIR}) -if(SKBUILD) - set(_cli_dest .) -endif() -install(TARGETS _cli LIBRARY DESTINATION ${_cli_dest}) +install(TARGETS _cli LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/Applications/Python/OpenGeoSys/__init__.py b/Applications/Python/OpenGeoSys/__init__.py index 628678b353d0ed28af41e50ddc1028a8d6974dac..d25cddd08e7908b69dc8a91f91528644ef17b312 100644 --- a/Applications/Python/OpenGeoSys/__init__.py +++ b/Applications/Python/OpenGeoSys/__init__.py @@ -2,7 +2,13 @@ import os import subprocess import sys -from ._cli import * +try: + from .lib64._cli import * +except ImportError: + try: + from .lib._cli import * + except ImportError: + print("ERROR: could not import OpenGeoSys Python module!") OGS_BIN_DIR = os.path.join(os.path.join(os.path.dirname(__file__), "bin")) diff --git a/CMakePresets.json b/CMakePresets.json index 3b710a650c633ac398198bcfd4df34d387bd9d3e..517f699d1b32102ccc0658b4b33cb0cedecbcabb 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -199,7 +199,10 @@ "OGS_USE_PYTHON": "OFF", "OGS_BUILD_PYTHON_MODULE": "ON", "OGS_BUILD_TESTING": "OFF", - "OGS_INSTALL_DEPENDENCIES": "OFF" + "OGS_INSTALL_DEPENDENCIES": "OFF", + "OGS_USE_PIP": "OFF", + "OGS_USE_MFRONT": "ON", + "BUILD_SHARED_LIBS": "ON" } } ],