Skip to content

Commit bb214d6

Browse files
committed
STYLE: Improve external project consistency
* vtkRenderingVR: Remove irrelevant VR_INCLUDE_DIR, VR_LIBRARY and VTK_VR_OBJECT_FACTORY introduced in 8c65442 (COMP: Update build-system to support against VTK >= 9.1) * Consistently use _module_subdir, _module_name and EP_SOURCE_DIR CMake variables.
1 parent e40e0b1 commit bb214d6

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

SuperBuild/External_vtkRenderingOpenVR.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${SUPERBUILD_TOPLEVEL_PROJECT}_USE_SYSTEM_${p
4747
set(VTK_SOURCE_DIR ${VTK_DIR}/../VTK)
4848
ExternalProject_Message(${proj} "VTK_SOURCE_DIR:${VTK_SOURCE_DIR}")
4949

50-
set(EP_SOURCE_DIR ${VTK_SOURCE_DIR}/Rendering/OpenVR)
50+
set(_module_subdir Rendering/OpenVR)
51+
set(_module_name RenderingOpenVR)
52+
53+
set(EP_SOURCE_DIR ${VTK_SOURCE_DIR}/${_module_subdir})
5154
set(EP_BINARY_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
5255

5356
ExternalProject_Add(${proj}
@@ -58,7 +61,7 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${SUPERBUILD_TOPLEVEL_PROJECT}_USE_SYSTEM_${p
5861
INSTALL_COMMAND ""
5962
CMAKE_CACHE_ARGS
6063
# VTKExternalModule
61-
-DVTK_MODULE_NAME:STRING=RenderingOpenVR
64+
-DVTK_MODULE_NAME:STRING=${_module_name}
6265
-DVTK_MODULE_SOURCE_DIR:PATH=${EP_SOURCE_DIR}
6366
-DVTK_MODULE_CMAKE_MODULE_PATH:PATH=${VTK_SOURCE_DIR}/CMake
6467
-DOpenVR_FIND_PACKAGE_VARS:STRING=OpenVR_INCLUDE_DIR;OpenVR_LIBRARY

SuperBuild/External_vtkRenderingVR.cmake

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${SUPERBUILD_TOPLEVEL_PROJECT}_USE_SYSTEM_${p
4545
set(VTK_SOURCE_DIR ${VTK_DIR}/../VTK)
4646
ExternalProject_Message(${proj} "VTK_SOURCE_DIR:${VTK_SOURCE_DIR}")
4747

48-
set(EP_SOURCE_DIR ${VTK_SOURCE_DIR}/Rendering/VR)
48+
set(_module_subdir Rendering/VR)
49+
set(_module_name RenderingVR)
50+
51+
set(EP_SOURCE_DIR ${VTK_SOURCE_DIR}/${_module_subdir})
4952
set(EP_BINARY_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
5053

5154
ExternalProject_Add(${proj}
@@ -56,7 +59,7 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${SUPERBUILD_TOPLEVEL_PROJECT}_USE_SYSTEM_${p
5659
INSTALL_COMMAND ""
5760
CMAKE_CACHE_ARGS
5861
# VTKExternalModule
59-
-DVTK_MODULE_NAME:STRING=RenderingVR
62+
-DVTK_MODULE_NAME:STRING=${_module_name}
6063
-DVTK_MODULE_SOURCE_DIR:PATH=${EP_SOURCE_DIR}
6164
-DVTK_MODULE_CMAKE_MODULE_PATH:PATH=${VTK_SOURCE_DIR}/CMake
6265
# vtkRenderingVR
@@ -72,10 +75,6 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${SUPERBUILD_TOPLEVEL_PROJECT}_USE_SYSTEM_${p
7275
-DCMAKE_MACOSX_RPATH:BOOL=0
7376
# Required to find VTK
7477
-DVTK_DIR:PATH=${VTK_DIR}
75-
# Required to find VR
76-
-DVTK_VR_OBJECT_FACTORY:BOOL=OFF
77-
-DVR_INCLUDE_DIR:PATH=${VR_INCLUDE_DIR}
78-
-DVR_LIBRARY:PATH=${VR_LIBRARY}
7978
${EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS}
8079
DEPENDS
8180
${${proj}_DEPENDS}

0 commit comments

Comments
 (0)