Merge pull request #1 from alecjacobson/alecjacobson/cleanup-cmake [ci skip]

cleanup cmake

Author: alecjacobson

.github/workflows/wheels.yml

@@ -51,6 +51,9 @@ jobs:
       CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "python -m delvewheel repair --no-mangle-all --add-path build\\temp.win-amd64-3.6\\Release;build\\temp.win-amd64-3.6\\Release\\Release;build\\temp.win-amd64-3.6\\Release\\_deps\\gmp-src\\lib;build\\temp.win-amd64-3.6\\Release\\_deps\\mpfr-src\\lib -w {dest_dir} {wheel} "
       # CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "cd C: && cmd //c tree //F"
       CIBW_SKIP: "*-win32 *_i686 pp* cp36* cp311* *musllinux*" # Skip 32-bit buildsa and PyPy, and 3.6(scipy) and 3.11(numpy) *musllinux*(scipy)
+      CIBW_TEST_COMMAND: "python {project}/tests/test_basic.py {project}/data/"
+      CIBW_TEST_SKIP: "*-macosx_arm64"
+      CIBW_ENVIRONMENT: "MAX_JOBS=2"
 
 
     steps:

CMakeLists.txt

@@ -15,20 +15,18 @@ include(Warnings)
 # Use C++11/14
 include(CXXFeatures)
 
-option(PY_IGL_PYTHON_TESTS          "Run Python tests"   ON)
+option(PY_IGL_DOWNLOAD_TEST_DATA          "Download test data"   ON)
+option(PY_IGL_DOWNLOAD_TUTORIAL_DATA      "Download tutorial data"   ON)
+
+# Generate position independent code by default
+set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE INTERNAL "")
 
 include(PyiglDependencies)
 
 if(NOT TARGET igl::core)
   include(libigl)
 endif()
 
-# NumpyEigen
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PYLIBIGL_EXTERNAL}/numpyeigen/cmake)
-# Generate position independent code by default
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-include(numpyeigen)
-
 # A module for writing bindings with our framework
 file(GLOB PYIGL_SOURCES src/*.cpp)
 
@@ -52,25 +50,9 @@ target_include_directories(pyigl_classes PRIVATE "${PYLIBIGL_EXTERNAL}/numpyeige
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-	foreach(config ${CMAKE_CONFIGURATION_TYPES})
-		string(TOUPPER ${config} config)
-		string(REPLACE /MD /MT CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
+  foreach(config ${CMAKE_CONFIGURATION_TYPES})
+    string(TOUPPER ${config} config)
+    string(REPLACE /MD /MT CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
     string(REPLACE /MD /MT CMAKE_CXX_FLAGS_${config} "${CMAKE_CXX_FLAGS_${config}}")
-    # LIST(APPEND CMAKE_CXX_FLAGS_${config} "/Zm")
-	endforeach()
-endif()
-
-# set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6)
-# find_package(PythonLibs REQUIRED)
-# find_package(PythonInterp REQUIRED)
-# target_link_libraries(pyigl PRIVATE ${PYTHON_LIBRARIES})
-# set_target_properties(pyigl PROPERTIES LINK_FLAGS "-Wl,-undefined,error")
-#set_target_properties(pyigl PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
-# set_target_properties(pyigl PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -msse2")
-# set_target_properties(pyigl PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/igl")
-
-if(${PY_IGL_PYTHON_TESTS})
-  pyigl_download_test_data()
-  enable_testing()
-  add_subdirectory(tests)
+  endforeach()
 endif()

cmake/DownloadProject.CMakeLists.cmake.in

@@ -8,23 +8,57 @@
 # Download and update 3rdparty libraries
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 list(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
-include(PyiglDownloadExternal)
 
 ################################################################################
 # Required libraries
 ################################################################################
 
-SET(NPE_WITH_EIGEN ${PYLIBIGL_EXTERNAL}/libigl/external/eigen)
 
 include(FetchContent)
+
 FetchContent_Declare(
     libigl
     GIT_REPOSITORY https://github.com/libigl/libigl.git
     GIT_TAG 238a607032d725cbf1b99cad2077516b1ee066d8
 )
+FetchContent_GetProperties(libigl)
 FetchContent_MakeAvailable(libigl)
 
-pyigl_download_numpyeigen()
-pyigl_download_tutorial_data()
+FetchContent_Declare(
+  numpyeigen
+  GIT_REPOSITORY https://github.com/fwilliams/numpyeigen.git
+  GIT_TAG        05a22ad4f06a431bffc3860b30c00cf89e81373b)
+# NumpyEigen's CMakeLists sets NPE_PYTHON_EXECUTABLE without a way to override,
+# so we must include directly rather that using FetchContent_MakeAvailable
+#FetchContent_MakeAvailable(numpyeigen)
+# Check if population has already been performed
+FetchContent_GetProperties(numpyeigen)
+if(NOT numpyeigen_POPULATED)
+  # Fetch the content using previously declared details
+  FetchContent_Populate(numpyeigen)
+endif()
+# Push CMAKE_MODULE_PATH
+set(PREV_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${numpyeigen_SOURCE_DIR}/cmake)
+# Why isn't eigen_SOURCE_DIR defined?
+SET(NPE_WITH_EIGEN "${libigl_SOURCE_DIR}/../eigen-src/"  CACHE INTERNAL "")
+include(numpyeigen)
+# Pop CMAKE_MODULE_PATH
+set(CMAKE_MODULE_PATH ${PREV_CMAKE_MODULE_PATH})
+
+if(${PY_IGL_DOWNLOAD_TEST_DATA})
+  FetchContent_Declare(test_data
+    SOURCE_DIR "${PYLIBIGL_EXTERNAL}/../data"
+    GIT_REPOSITORY https://github.com/libigl/libigl-tests-data.git
+    GIT_TAG        19cedf96d70702d8b3a83eb27934780c542356fe)
+  FetchContent_MakeAvailable(test_data)
+endif()
 
+if(${PY_IGL_DOWNLOAD_TUTORIAL_DATA})
+  FetchContent_Declare(tutorial_data
+    SOURCE_DIR "${PYLIBIGL_EXTERNAL}/../tutorial/data"
+    GIT_REPOSITORY https://github.com/libigl/libigl-tutorial-data.git
+    GIT_TAG        c1f9ede366d02e3531ecbaec5e3769312f31cccd)
+  FetchContent_MakeAvailable(tutorial_data)
+endif()