From f1e34a9c5586dcd52ab8fb5ab34f7e910556aea4 Mon Sep 17 00:00:00 2001
From: Ricardo Ortiz <ricardo.ortiz@kitware.com>
Date: Tue, 1 Sep 2015 14:42:46 -0400
Subject: [PATCH] Fix linux vtk build.

---
 CMake/SuperBuild/External_vtk.cmake |  8 ++++++--
 CMake/SuperBuild/SuperBuild.cmake   | 16 ++++++++--------
 CMakeLists.txt                      |  1 +
 IO/CMakeLists.txt                   |  1 -
 VTKRendering/CMakeLists.txt         |  1 +
 VTKRendering/MeshNodalCoordinates.h |  1 -
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CMake/SuperBuild/External_vtk.cmake b/CMake/SuperBuild/External_vtk.cmake
index 100936894..cd1701ecf 100644
--- a/CMake/SuperBuild/External_vtk.cmake
+++ b/CMake/SuperBuild/External_vtk.cmake
@@ -56,10 +56,13 @@ if(NOT DEFINED ${proj}_DIR)
       -DVTK_Group_StandAlone:BOOL=OFF
       -DVTK_Group_Rendering:BOOL=OFF
       -DModule_vtkRenderingOpenGL2:BOOL=ON
+      -DModule_vtkIOXML:BOOL=ON
+      -DModule_vtkIOLegacy:BOOL=ON
+      -DModule_vtkIOPLY:BOOL=ON
+      -DModule_vtkInteractionStyle:BOOL=ON
       -DVTK_RENDERING_BACKEND:STRING=OpenGL2
       -DVTK_WRAP_PYTHON:BOOL=OFF
       ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
-      ${OUTPUT_DIRECTORIES}
     DEPENDS
       ${${proj}_DEPENDENCIES}
 #     LOG_DOWNLOAD 1            # Wrap download in script to log output
@@ -69,10 +72,11 @@ if(NOT DEFINED ${proj}_DIR)
 #     LOG_TEST 1                # Wrap test in script to log output
 #     LOG_INSTALL 1             # Wrap install in script to log output
     )
-  set(${proj}_DIR ${CMAKE_BINARY_DIR}/SuperBuild/${proj}-build)
+  set(${proj}_DIR ${CMAKE_BINARY_DIR}/SimMedTK-build/lib)
 
 else()
   SimMedTKEmptyExternalProject(${proj} "${${proj}_DEPENDENCIES}")
 endif()
 
 set(SimMedTK_CMAKE_INCLUDE_PATH ${CMAKE_BINARY_DIR}/SuperBuild/${proj}/include/${sep}${SimMedTK_CMAKE_INCLUDE_PATH})
+list(APPEND SimMedTK_SUPERBUILD_EP_ARGS VTK_DIR:PATH=${${proj}_DIR})
diff --git a/CMake/SuperBuild/SuperBuild.cmake b/CMake/SuperBuild/SuperBuild.cmake
index 91537b672..866a32f8d 100755
--- a/CMake/SuperBuild/SuperBuild.cmake
+++ b/CMake/SuperBuild/SuperBuild.cmake
@@ -169,14 +169,14 @@ endif(WIN32)
 #
 SET(proj SimMedTK-Configure)
 
-if (NOT SimMedTK_VTK_DIR)
-  find_package(VTK REQUIRED)
-  mark_as_advanced(SimMedTK_VTK_DIR)
-  set(SimMedTK_VTK_DIR ${VTK_DIR})
-endif()
-list(APPEND SimMedTK_SUPERBUILD_CMAKE_OPTIONS
-  "-DVTK_DIR:FILEPATH=${SimMedTK_VTK_DIR}"
-)
+# if (NOT SimMedTK_VTK_DIR)
+#   find_package(VTK REQUIRED)
+#   mark_as_advanced(SimMedTK_VTK_DIR)
+#   set(SimMedTK_VTK_DIR ${VTK_DIR})
+# endif()
+# list(APPEND SimMedTK_SUPERBUILD_CMAKE_OPTIONS
+#   "-DVTK_DIR:FILEPATH=${SimMedTK_VTK_DIR}"
+# )
 
 message("SimMedTK_BUILD_SHARED_LIBS=${SimMedTK_BUILD_SHARED_LIBS}")
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28df3df51..7bc9a2e26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,6 +172,7 @@ find_package(Assimp REQUIRED)
 find_package(Eigen3 REQUIRED)
 find_package(VegaFEM REQUIRED CONFIG)
 find_package(ThreadPool REQUIRED)
+
 find_package(VTK REQUIRED)
 
 if(SimMedTK_USE_OCULUS)
diff --git a/IO/CMakeLists.txt b/IO/CMakeLists.txt
index f4b34b69f..be6ebaf7e 100644
--- a/IO/CMakeLists.txt
+++ b/IO/CMakeLists.txt
@@ -1,4 +1,3 @@
-find_package(VTK REQUIRED)
 
 include(${VTK_USE_FILE})
 
diff --git a/VTKRendering/CMakeLists.txt b/VTKRendering/CMakeLists.txt
index 998d9256f..905053272 100644
--- a/VTKRendering/CMakeLists.txt
+++ b/VTKRendering/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 include(${VTK_USE_FILE})
 
 simmedtk_add_library(VTKRendering
diff --git a/VTKRendering/MeshNodalCoordinates.h b/VTKRendering/MeshNodalCoordinates.h
index c17cdd2d8..7d02c29e7 100644
--- a/VTKRendering/MeshNodalCoordinates.h
+++ b/VTKRendering/MeshNodalCoordinates.h
@@ -26,7 +26,6 @@
 #define MESHNODALCOORDINATES_H
 
 #include "vtkMappedDataArray.h"
-#include "vtkIOExodusModule.h" // For export macro
 
 #include "vtkTypeTemplate.h" // For templated vtkObject API
 #include "vtkObjectFactory.h" // for vtkStandardNewMacro
-- 
GitLab