A few more fixes and cleanup

Kitware · Aug 28, 2015 · 42fe909 · 42fe909
1 parent 7a55f24
commit 42fe909
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/CMake/vtkAndroid.cmake b/CMake/vtkAndroid.cmake
@@ -53,6 +53,11 @@ else()
   set(VTK_BUILD_COMMAND BUILD_COMMAND make)
 endif()
 
+set(BUILD_ALWAYS_STRING)
+if(${CMAKE_VERSION} GREATER 3.0)
+  set(BUILD_ALWAYS_STRING BUILD_ALWAYS 1)
+endif()
+
 # Compile a minimal VTK for its compile tools
 macro(compile_vtk_tools)
   ExternalProject_Add(
@@ -63,7 +68,7 @@ macro(compile_vtk_tools)
     ${VTK_BUILD_COMMAND} vtkCompileTools
     ${BUILD_ALWAYS_STRING}
     INSTALL_DIR ${INSTALL_DIR}/vtk-compile-tools
-    CMAKE_CACHE_ARGS
+    CMAKE_ARGS
       -DCMAKE_BUILD_TYPE:STRING=Release
       -DVTK_BUILD_ALL_MODULES:BOOL=OFF
       -DVTK_Group_Rendering:BOOL=OFF
@@ -124,11 +129,6 @@ set(android_cmake_flags
   -DModule_vtkRenderingFreeType:BOOL=OFF
 )
 
-set(BUILD_ALWAYS_STRING)
-if(${CMAKE_VERSION} GREATER 3.0)
-  set(BUILD_ALWAYS_STRING "BUILD_ALWAYS 1")
-endif()
-
 macro(crosscompile target toolchain_file)
   ExternalProject_Add(
     ${target}
@@ -142,7 +142,6 @@ macro(crosscompile target toolchain_file)
       -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}/${target}
       -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
       -DCMAKE_TOOLCHAIN_FILE:PATH=CMake/${toolchain_file}
-    CMAKE_CACHE_ARGS
       -DANDROID_NDK:PATH=${ANDROID_NDK}
       -DVTKCompileTools_DIR:PATH=${BUILD_DIR}/vtk-compile-tools
       ${android_cmake_flags}

diff --git a/CMake/vtkiOS.cmake b/CMake/vtkiOS.cmake
@@ -41,6 +41,11 @@ else()
   set(VTK_BUILD_COMMAND BUILD_COMMAND make)
 endif()
 
+set(BUILD_ALWAYS_STRING)
+if(${CMAKE_VERSION} GREATER 3.0)
+  set(BUILD_ALWAYS_STRING BUILD_ALWAYS 1)
+endif()
+
 # Compile a minimal VTK for its compile tools
 macro(compile_vtk_tools)
   ExternalProject_Add(
@@ -49,7 +54,7 @@ macro(compile_vtk_tools)
     PREFIX ${PREFIX_DIR}/vtk-compile-tools
     BINARY_DIR ${BUILD_DIR}/vtk-compile-tools
     ${VTK_BUILD_COMMAND} vtkCompileTools
-    BUILD_ALWAYS 1
+    ${BUILD_ALWAYS_STRING}
     INSTALL_DIR ${INSTALL_DIR}/vtk-compile-tools
     CMAKE_CACHE_ARGS
       -DCMAKE_BUILD_TYPE:STRING=Release
@@ -80,7 +85,7 @@ mark_as_advanced(
 set(ios_cmake_flags
   -DBUILD_SHARED_LIBS:BOOL=OFF
   -DBUILD_TESTING:BOOL=OFF
-  -DBUILD_EXAMPLES:BOOL=ON
+  -DBUILD_EXAMPLES:BOOL=${BUILD_EXAMPLES}
   -DVTK_RENDERING_BACKEND:STRING=OpenGL2
   -DOPENGL_ES_VERSION:STRING=${OPENGL_ES_VERSION}
   -DVTK_Group_Rendering:BOOL=OFF
@@ -115,14 +120,13 @@ macro(crosscompile target toolchain_file archs)
     BINARY_DIR ${BUILD_DIR}/${target}
     INSTALL_DIR ${INSTALL_DIR}/${target}
     DEPENDS vtk-compile-tools
-    BUILD_ALWAYS 1
+    ${BUILD_ALWAYS_STRING}
     CMAKE_ARGS
       -DCMAKE_CROSSCOMPILING:BOOL=ON
       #-DCMAKE_OSX_ARCHITECTURES:STRING=${archs}
       -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
       -DCMAKE_TOOLCHAIN_FILE:FILEPATH=CMake/${toolchain_file}
       -DVTKCompileTools_DIR:PATH=${BUILD_DIR}/vtk-compile-tools
-    CMAKE_CACHE_ARGS
       -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}/${target}
       ${ios_cmake_flags}
   )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -98,6 +98,10 @@ include(vtkVersion)
 set(VTK_VERSION
     "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
 
+#-----------------------------------------------------------------------------
+# Do we want examples built?
+OPTION(BUILD_EXAMPLES "Build VTK examples." OFF)
+
 option(VTK_IOS_BUILD "Build vtk.framework for iOS" OFF)
 if (VTK_IOS_BUILD)
   include(vtkiOS)
@@ -434,10 +438,6 @@ INCLUDE(vtkTestStreamsLibrary)
 # Dispatch the build into the proper subdirectories.
 SET(VTK_HAS_EXODUS 1)
 
-#-----------------------------------------------------------------------------
-# Provide a few configuration options.
-OPTION(BUILD_EXAMPLES "Build VTK examples." OFF)
-
 #-----------------------------------------------------------------------------
 # Configure files with settings for use by the build.