Commit ad9f8f4d authored by Chris Harris's avatar Chris Harris Committed by Code Review
Browse files

Merge topic 'cmake-enhancements' into master

697419e5 VTK_BUILD_ALL_MODULES is an advanced variable
d1d562ce Marked Mac OS X specific variables as advanced
e67e514a Mark HDF5 cache variable as advanced.
295be8a4 Mark VTK_MATERIALS_DIRS as advanced
0c9a2346 Mark some verdict options as advanced cache variables
aaf3e86a Removed references to CMake 2.4
parents 097c155b 697419e5
......@@ -76,6 +76,7 @@ endforeach()
# Provide an option for all modules.
option(VTK_BUILD_ALL_MODULES "Request to build all modules" OFF)
mark_as_advanced(VTK_BUILD_ALL_MODULES)
# Provide an option for each module.
foreach(vtk-module ${VTK_MODULES_ALL})
......
......@@ -10,7 +10,7 @@ IF("VTK_EXPLICIT_TEMPLATES" MATCHES "^VTK_EXPLICIT_TEMPLATES")
STRING(ASCII 35 POUND)
WRITE_FILE(
${VTK_BINARY_DIR}/CMakeTmp/TestExplicitInstantiation/CMakeLists.txt
"CMAKE_MINIMUM_REQUIRED(VERSION 2.4)\n"
"CMAKE_MINIMUM_REQUIRED(VERSION 2.8)\n"
"PROJECT(EXPLICIT)\n"
"ADD_LIBRARY(A A.cxx)\n"
"ADD_EXECUTABLE(B B.cxx)\n"
......
......@@ -125,6 +125,15 @@ include(vtkBuildPath)
#-----------------------------------------------------------------------------
include(CTest)
#-----------------------------------------------------------------------------
if(APPLE)
mark_as_advanced(
CMAKE_OSX_ARCHITECTURES
CMAKE_OSX_DEPLOYMENT_TARGET
CMAKE_OSX_SYSROOT
)
endif()
#-----------------------------------------------------------------------------
# Does VTK require support for 64 bit file systems
INCLUDE(CheckCXXSourceRuns)
......
......@@ -4,8 +4,6 @@ set(vtkalglib_THIRD_PARTY 1)
set(vtkalglib_LIBRARIES vtkalglib)
vtk_module_impl()
cmake_minimum_required( VERSION 2.4 )
if ( NOT LIBRARY_OUTPUT_PATH )
set( LIBRARY_OUTPUT_PATH ${alglib_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
endif ( NOT LIBRARY_OUTPUT_PATH )
......
......@@ -69,3 +69,7 @@ foreach(lib
)
vtk_target(${lib} NO_INSTALL)
endforeach()
if(APPLE)
mark_as_advanced(HDF5_BUILD_WITH_INSTALL_NAME)
endif()
# Copyright (c) 2003,2006 Sandia National Laboratories <cubit@sandia.gov>
project(verdict)
cmake_minimum_required( VERSION 2.4.5 )
if ( COMMAND CMAKE_POLICY )
cmake_policy( SET CMP0003 NEW )
endif( COMMAND CMAKE_POLICY )
......@@ -12,7 +11,6 @@ set( verdict_BUILD_VERSION "0")
set( verdict_VERSION_FLAT "${verdict_MAJOR_VERSION}${verdict_MINOR_VERSION}${verdict_BUILD_VERSION}" )
set( verdict_VERSION "${verdict_MAJOR_VERSION}.${verdict_MINOR_VERSION}.${verdict_BUILD_VERSION}" )
option(BUILD_SHARED_LIBS "Build Verdict with shared libraries." OFF)
option(VERDICT_BUILD_DOC "Build the 2007 Verdict User Manual" OFF)
option(VERDICT_MANGLE "Mangle verdict names for inclusion in a larger library?" OFF)
if ( VERDICT_MANGLE )
......@@ -26,6 +24,7 @@ endif ( VERDICT_MANGLE )
mark_as_advanced( VERDICT_MANGLE )
option( VERDICT_ENABLE_TESTING "Should tests of the VERDICT library be built?" OFF )
mark_as_advanced(VERDICT_BUILD_DOC VERDICT_ENABLE_TESTING)
include_directories(
${verdict_BINARY_DIR}
......
......@@ -11,6 +11,7 @@ set(VTK_MATERIALS_DIRS
${VTK_DEFAULT_SHADERS_DIR}
CACHE STRING
"A ; separated list of directories to search for materials/shaders.")
mark_as_advanced(VTK_MATERIALS_DIRS)
include_directories("${VTK_SOURCE_DIR}/Common/Core"
"${VTK_BINARY_DIR}/Common/Core")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment