COMP: Update VTKExternalModule adding support for finding VTKCompileT…

…ools
Korijn · Apr 27, 2023 · d2c5449 · d2c5449
1 parent 67d6d61
commit d2c5449
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/FetchVTKExternalModule.cmake b/FetchVTKExternalModule.cmake
@@ -10,8 +10,8 @@ endif()
 
 FetchContent_Populate(${proj}
   SOURCE_DIR     ${EP_SOURCE_DIR}
-  GIT_REPOSITORY https://github.com/KitwareMedical/VTKExternalModule.git
-  GIT_TAG        c1906cf121e34b6391a91c2fffc448eca402a6cc
+  GIT_REPOSITORY https://github.com/jcfr/VTKExternalModule.git
+  GIT_TAG        8b616051a0decd0aadade2644615aa66e44323c8
   QUIET
   )
 

diff --git a/setup.py b/setup.py
@@ -176,7 +176,7 @@ def auto_build_vtk_compile_tools():
     f"-DVTK_MODULE_CMAKE_MODULE_PATH:PATH={vtk_wheel_sdk_cmake_path}",
     "-DVTK_MODULE_SUPERBUILD:BOOL=ON",
     "-DVTK_MODULE_EXTERNAL_PROJECT_DEPENDENCIES:STRING=U3D",
-    "-DVTK_MODULE_EXTERNAL_PROJECT_CMAKE_CACHE_ARGS:STRING=CMAKE_CROSSCOMPILING;VTKCompileTools_DIR;VTK_USE_X;VTK_USE_COCOA",
+    "-DVTK_MODULE_EXTERNAL_PROJECT_CMAKE_CACHE_ARGS:STRING=VTK_USE_X;VTK_USE_COCOA",
     f"-DVTK_DIR:PATH={vtk_wheel_sdk_cmake_path}",
     "-DCMAKE_INSTALL_LIBDIR:STRING=lib",
     f"-DPython3_EXECUTABLE:FILEPATH={python3_executable}",
@@ -207,6 +207,10 @@ def auto_build_vtk_compile_tools():
         vtk_compile_tools_dir = auto_build_vtk_compile_tools()
         cmake_args.append(f"-DVTKCompileTools_DIR:PATH={vtk_compile_tools_dir}")
 
+
+from pprint import pprint as pp
+pp(cmake_args)
+
 long_description = (vtk_module_source_dir / "README.md").read_text(encoding="utf-8")
 
 setup(