finish wheel for win

gimli-org · Mar 15, 2024 · d1ab58e · d1ab58e
1 parent 5443be8
commit d1ab58e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -327,12 +327,14 @@ if (NOT Boost_INCLUDE_DIR OR NOT Boost_ROOT)
     else()
         message(STATUS "Boost_ROOT not set: building local")
         if (NOT Boost_INCLUDE_DIR)
+            message(STATUS " .. building local without Boost_INCLUDE_DIR")
             find_boost_root_from_distname_file()
             find_or_build_package(Boost boost)
             if (NOT Boost_ROOT)
                 find_boost_root_from_distname_file()
             endif()
         else()
+            message(STATUS " .. building local with Boost_INCLUDE_DIR=${Boost_INCLUDE_DIR}")
             find_boost_root_from_distname_file()
             find_or_build_package_check(Boost boost Boost_INCLUDE_DIR False)
             find_boost_root_from_distname_file()
@@ -437,11 +439,10 @@ if (NOT Boost_PYTHON_LIBRARY)
         message(STATUS "Boost_PYTHON_FOUND:" ${Boost_PYTHON_FOUND})
         message(STATUS "Boost_PYTHON_LIBRARY:" ${Boost_PYTHON_LIBRARY})
     else()
-        message(STATUS "Sorry but no boost-python found. Please search for "
+        message(FATAL_ERROR "Sorry but no boost-python found. Please search for "
                        "any libboost_python* on your system and "
                        "provide it to the authors so we can try to fix "
                        "this here.")
-        #exit()
     endif()
 endif()
 

diff --git a/core/cmake/GIMLImacros.cmake b/core/cmake/GIMLImacros.cmake
@@ -232,7 +232,12 @@ macro(build_package package get_package)
     )
 endmacro()
 
-macro(find_or_build_package_check package get_package checkVar forceLocal)
+macro(find_or_build_package_check 
+        package 
+        get_package 
+        checkVar 
+        forceLocal
+        )
 
     message(STATUS "** Find or build ${package} at: ${checkVar} force: ${forceLocal}")
     find_package(${package})

diff --git a/pygimli/setup.py.in b/pygimli/setup.py.in
@@ -45,9 +45,11 @@ setup(
                       'matplotlib>=3.7.0',
                       'scipy>=1.11.0',
                       'scooby',
+                      'pyvista[all]>=0.42',
+                      'tetgen',
                       ],
-    extras_require = {
-        'all':  ['pyvista[all]>=0.42'],
-    },
+    #extras_require = {
+    #    'all':  ['pyvista[all]>=0.42'],
+    #},
     classifiers=CLASSIFIERS,
 )