From 335bc0015613447737aacc01e51cf8546ce1f294 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 15 May 2019 13:08:43 -0400
Subject: [PATCH] vtkDirectories: defer build tree location setting
---
CMake/vtkDirectories.cmake | 5 -----
CMakeLists.txt | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMake/vtkDirectories.cmake b/CMake/vtkDirectories.cmake
index f12fb0f0e16..cc7e943c318 100644
--- a/CMake/vtkDirectories.cmake
+++ b/CMake/vtkDirectories.cmake
@@ -12,8 +12,3 @@ vtk_set_with_default(VTK_INSTALL_DOC_DIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${vtk
vtk_set_with_default(VTK_INSTALL_PACKAGE_DIR "${VTK_INSTALL_LIBRARY_DIR}/cmake/${vtk_subdir}")
vtk_set_with_default(VTK_INSTALL_DOXYGEN_DIR "${VTK_INSTALL_DOC_DIR}/doxygen")
vtk_set_with_default(VTK_INSTALL_NDK_MODULES_DIR "${VTK_INSTALL_DATA_DIR}/ndk-modules")
-
-# Set up our directory structure for output libraries and binaries
-vtk_set_with_default(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
-vtk_set_with_default(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
-vtk_set_with_default(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 779610c8716..b3d2d38290a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,11 @@ mark_as_advanced(VTK_ENABLE_LOGGING)
include(vtkEncodeString)
+# Set up our directory structure for output libraries and binaries
+vtk_set_with_default(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
+vtk_set_with_default(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
+vtk_set_with_default(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
+
set(vtk_requested_modules)
set(vtk_rejected_modules)
if (VTK_WRAP_PYTHON)
--
GitLab