Skip to content
Snippets Groups Projects
Commit f1e34a9c authored by Ricardo Ortiz's avatar Ricardo Ortiz
Browse files

Fix linux vtk build.

parent 005e5ac6
No related merge requests found
......@@ -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})
......@@ -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}")
......
......@@ -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)
......
find_package(VTK REQUIRED)
include(${VTK_USE_FILE})
......
include(${VTK_USE_FILE})
simmedtk_add_library(VTKRendering
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment