fix: trying to add back pip compilation, ok with shared

asonolet · Jan 24, 2025 · 7412353 · 7412353
1 parent 5d6b0f0
commit 7412353
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ install/
 venv/
 __pycache__/
 ConanPresets.json
+venv-*
diff --git a/conanfile.py b/conanfile.py
@@ -11,7 +11,7 @@ class Recipe(ConanFile):
         "is_32bit": [True, False],
     }
     default_options = {
-        "shared": True,
+        "shared": False,
         "fPIC": True,
         "parallel": False,
         "is_32bit": False,

diff --git a/medcoupling_core/source/CMakeLists.txt b/medcoupling_core/source/CMakeLists.txt
@@ -132,7 +132,7 @@ set_target_properties(
   INSTALL_RPATH ${MEDCOUPLING_INSTALL_LIBS_DEPS_RPATH}
   OUTPUT_NAME "medcoupling")
 
-target_link_libraries(medcouplingcpp PRIVATE medcoupling_core_flags)
+target_link_libraries(medcouplingcpp PRIVATE $<BUILD_INTERFACE:medcoupling_core_flags>)
 target_compile_definitions(medcouplingcpp PRIVATE interpkernel_EXPORTS)
 
 target_include_directories(medcouplingcpp

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,3 +16,4 @@ wheel.packages = []
 [tool.scikit-build.cmake.define]
 CMAKE_PROJECT_TOP_LEVEL_INCLUDES = "ext/cmake-conan/conan_provider.cmake"
 CMAKE_INSTALL_RPATH_USE_LINK_PATH = "ON"
+BUILD_SHARED_LIBS = "ON"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ install/ @@
     venv/
     __pycache__/
     ConanPresets.json
+    venv-*