Merge pull request CRPropa#469 from JulienDoerner/master

add python_install_package as ccmake option, adapt example test
lukasmerten · Feb 22, 2024 · e96e93a · e96e93a
2 parents 3498d82 + 76fef90
commit e96e93a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
@@ -33,7 +33,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
+          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/
       - name: Build CRPropa
         run: |
           cd build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -466,9 +466,7 @@ if(ENABLE_PYTHON AND Python_FOUND)
 
 
   #  use Python_INSTALL_PACKAGE_DIR if provided; otherwise, install in Python_SITELIB 
-  if(NOT DEFINED Python_INSTALL_PACKAGE_DIR)
-    set(Python_INSTALL_PACKAGE_DIR "${Python_SITELIB}")
-  endif(NOT DEFINED Python_INSTALL_PACKAGE_DIR)
+  set(Python_INSTALL_PACKAGE_DIR "${Python_SITELIB}" CACHE PATH "folder in which the python package is installed")
   message(STATUS "  package install directory: ${Python_INSTALL_PACKAGE_DIR}")