CIBW...

thermotools · Jul 25, 2024 · 1cb87d4 · 1cb87d4
1 parent 19d2a6f
commit 1cb87d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -31,7 +31,7 @@ jobs:
           CIBW_BUILD_VERBOSITY_WINDOWS: 2
           CIBW_SKIP: "*pypy* *pp* *cp36* *cp37* *musl*"
         with:
-          package-dir: "addon/pycThermopack"
+          package-dir: "./addon/pycThermopack"
           output-dir: "./wheelhouse"
           config-file: "{package}/pyproject.toml"
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,16 +38,16 @@ else()
     set(tp_fortran_flags ${tp_optim_flags})
 endif()
 
-add_subdirectory("${CMAKE_SOURCE_DIR}/src" "thermopack")
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src "thermopack")
 
 option(test "Build test suite" OFF)
 if(test)
     cmake_policy(SET CMP0074 NEW)
     find_package(PFUNIT QUIET)
     if (NOT PFUNIT_FOUND)
-        message("${ColorRed}Did not find pFUnit, building from source. If you have installed pFUnit, make sure that PFUNIT_DIR is set.")
-        add_subdirectory(${CMAKE_SOURCE_DIR}/external/pFUnit)
+        message("${ColorRed}Did not find pFUnit. If you have installed pFUnit, make sure that PFUNIT_DIR is set. Falling back to building pFUnit from source...")
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/pFUnit)
     endif()
     message("${ColorBlue}Creating run_unittests target")
-    add_subdirectory("${CMAKE_SOURCE_DIR}/unittests")
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unittests)
 endif()
diff --git a/addon/pycThermopack/CMakeLists.txt b/addon/pycThermopack/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.2)
+project(pycThermoPack LANGUAGES Fortran)
+
+add_subdirectory(${CMAKE_SOURCE_DIR}/../.. "thermopack")