try 2

evaleev · Jan 10, 2024 · 778dfb3 · 778dfb3
1 parent 7f54db0
commit 778dfb3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
@@ -62,6 +62,7 @@ jobs:
         -D MULTIPOLE_MAX_ORDER=2
         -D LIBINT2_ENABLE_FORTRAN=ON
         -D LIBINT2_ENABLE_PYTHON=ON
+        -D Python_EXECUTABLE=${{ matrix.os == 'macos-latest' && '/usr/local/Frameworks/Python.framework/Versions/3.11/bin/python3.11' || '/usr/bin/python3.8' }}
 
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 
 pybind11_add_module(
   libint2-python
-  #EXCLUDE_FROM_ALL
+  EXCLUDE_FROM_ALL
   MODULE
     src/libint2/libint2.cc
     src/libint2/engine.cc

diff --git a/src/lib/libint/CMakeLists.txt.export b/src/lib/libint/CMakeLists.txt.export
@@ -245,17 +245,19 @@ if (MSVC)
 endif()
 
 
-if (BUILD_SHARED_LIBS OR LIBINT2_BUILD_SHARED_AND_STATIC_LIBS)
+if (LIBINT2_BUILD_SHARED_AND_STATIC_LIBS OR BUILD_SHARED_LIBS)
     set(L2_BUILD_SHARED_LIBS 1)
+endif()
+if (LIBINT2_BUILD_SHARED_AND_STATIC_LIBS OR (NOT BUILD_SHARED_LIBS))
+    set(L2_BUILD_STATIC_LIBS 1)
+endif()
+if (L2_BUILD_SHARED_LIBS OR (LIBINT2_ENABLE_PYTHON AND NOT MSVC))
     set_target_properties(
       int-obj
       PROPERTIES
         POSITION_INDEPENDENT_CODE 1
       )
 endif()
-if (NOT BUILD_SHARED_LIBS OR LIBINT2_BUILD_SHARED_AND_STATIC_LIBS)
-    set(L2_BUILD_STATIC_LIBS 1)
-endif()
 
 if (L2_BUILD_SHARED_LIBS)