summaryrefslogtreecommitdiffstats
path: root/Modules/UseVTKConfig40.cmake
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2012-08-13 17:50:14 (GMT)
committerBrad King <brad.king@kitware.com>2012-08-13 18:19:16 (GMT)
commit9db3116226cb99fcf54e936c833953abcde9b729 (patch)
treebd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/UseVTKConfig40.cmake
parent77543bde41b0e52c3959016698b529835945d62d (diff)
downloadCMake-9db3116226cb99fcf54e936c833953abcde9b729.zip
CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz
CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.bz2
Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block. This is no longer the preferred style. Run the following shell code: for c in else endif endforeach endfunction endmacro endwhile; do echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | egrep -z -v 'Tests/CMakeTests/While-Endwhile-' | xargs -0 sed -i -f convert.sed && rm convert.sed
Diffstat (limited to 'Modules/UseVTKConfig40.cmake')
-rw-r--r--Modules/UseVTKConfig40.cmake70
1 files changed, 35 insertions, 35 deletions
diff --git a/Modules/UseVTKConfig40.cmake b/Modules/UseVTKConfig40.cmake
index 549a792..554b8c4 100644
--- a/Modules/UseVTKConfig40.cmake
+++ b/Modules/UseVTKConfig40.cmake
@@ -160,28 +160,28 @@ set(VTK_WRAP_TCL ${VTK40_VTK_WRAP_TCL})
set(VTK_KITS COMMON FILTERING GRAPHICS IMAGING IO)
if(VTK_USE_RENDERING)
set(VTK_KITS ${VTK_KITS} RENDERING)
-endif(VTK_USE_RENDERING)
+endif()
if(VTK_USE_HYBRID)
set(VTK_KITS ${VTK_KITS} HYBRID)
-endif(VTK_USE_HYBRID)
+endif()
if(VTK_USE_PARALLEL)
set(VTK_KITS ${VTK_KITS} PARALLEL)
-endif(VTK_USE_PARALLEL)
+endif()
if(VTK_USE_PATENTED)
set(VTK_KITS ${VTK_KITS} PATENTED)
-endif(VTK_USE_PATENTED)
+endif()
# Create the list of available languages.
set(VTK_LANGUAGES "")
if(VTK_WRAP_TCL)
set(VTK_LANGUAGES ${VTK_LANGUAGES} TCL)
-endif(VTK_WRAP_TCL)
+endif()
if(VTK_WRAP_PYTHON)
set(VTK_LANGUAGES ${VTK_LANGUAGES} PYTHON)
-endif(VTK_WRAP_PYTHON)
+endif()
if(VTK_WRAP_JAVA)
set(VTK_LANGUAGES ${VTK_LANGUAGES} JAVA)
-endif(VTK_WRAP_JAVA)
+endif()
# Include directories for other projects installed on the system and
# used by VTK.
@@ -192,40 +192,40 @@ if(VTK_USE_RENDERING)
if(VTK_USE_X)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS}
${VTK40_CMAKE_Xlib_INCLUDE_PATH} ${VTK40_CMAKE_Xutil_INCLUDE_PATH})
- endif(VTK_USE_X)
-endif(VTK_USE_RENDERING)
+ endif()
+endif()
if(VTK_OPENGL_HAS_OSMESA)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS}
${VTK40_OSMESA_INCLUDE_PATH})
-endif(VTK_OPENGL_HAS_OSMESA)
+endif()
if(VTK_USE_MPI)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS} ${VTK40_MPI_INCLUDE_PATH})
-endif(VTK_USE_MPI)
+endif()
if(VTK_WRAP_TCL)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS} ${VTK40_TCL_INCLUDE_PATH})
-endif(VTK_WRAP_TCL)
+endif()
if(VTK_WRAP_PYTHON)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS} ${VTK40_PYTHON_INCLUDE_PATH})
-endif(VTK_WRAP_PYTHON)
+endif()
if(VTK_WRAP_JAVA)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS}
${VTK40_JAVA_INCLUDE_PATH} ${VTK40_JAVA_INCLUDE_PATH2})
-endif(VTK_WRAP_JAVA)
+endif()
if(VTK_HAVE_VG500)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS}
${VTK40_VLI_INCLUDE_PATH_FOR_VG500})
-endif(VTK_HAVE_VG500)
+endif()
if(VTK_HAVE_VP1000)
set(VTK_INCLUDE_DIRS_SYS ${VTK_INCLUDE_DIRS_SYS}
${VTK40_VLI_INCLUDE_PATH_FOR_VP1000})
-endif(VTK_HAVE_VP1000)
+endif()
# See if this is a build tree or install tree.
if(EXISTS ${VTK_DIR}/Common)
@@ -237,16 +237,16 @@ if(EXISTS ${VTK_DIR}/Common)
set(VTK_INCLUDE_DIRS ${VTK40_VTK_BINARY_DIR})
if(VTK_USE_PARALLEL)
set(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${VTK40_VTK_SOURCE_DIR}/Parallel)
- endif(VTK_USE_PARALLEL)
+ endif()
if(VTK_USE_HYBRID)
set(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${VTK40_VTK_SOURCE_DIR}/Hybrid)
- endif(VTK_USE_HYBRID)
+ endif()
if(VTK_USE_PATENTED)
set(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${VTK40_VTK_SOURCE_DIR}/Patented)
- endif(VTK_USE_PATENTED)
+ endif()
if(VTK_USE_RENDERING)
set(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${VTK40_VTK_SOURCE_DIR}/Rendering)
- endif(VTK_USE_RENDERING)
+ endif()
# These directories are always needed.
set(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS}
@@ -268,16 +268,16 @@ if(EXISTS ${VTK_DIR}/Common)
set(VTK_TCL_EXE ${VTK40_EXECUTABLE_OUTPUT_PATH}/vtk)
set(VTK_WRAP_TCL_EXE ${VTK40_VTK_WRAP_TCL_EXE})
set(VTK_TCL_HOME ${VTK40_VTK_SOURCE_DIR}/Wrapping/Tcl)
- endif(VTK_WRAP_TCL)
+ endif()
if(VTK_WRAP_PYTHON)
set(VTK_WRAP_PYTHON_EXE ${VTK40_VTK_WRAP_PYTHON_EXE})
- endif(VTK_WRAP_PYTHON)
+ endif()
if(VTK_WRAP_JAVA)
set(VTK_PARSE_JAVA_EXE ${VTK40_VTK_PARSE_JAVA_EXE})
set(VTK_WRAP_JAVA_EXE ${VTK40_VTK_WRAP_JAVA_EXE})
- endif(VTK_WRAP_JAVA)
+ endif()
-else(EXISTS ${VTK_DIR}/Common)
+else()
# This is a VTK 4.0 install tree.
set(VTK_INCLUDE_DIRS ${VTK_DIR})
@@ -288,15 +288,15 @@ else(EXISTS ${VTK_DIR}/Common)
set(VTK_TCL_EXE ${VTK40_CMAKE_INSTALL_PREFIX}/bin/vtk)
set(VTK_WRAP_TCL_EXE ${VTK40_CMAKE_INSTALL_PREFIX}/bin/vtkWrapTcl)
set(VTK_TCL_HOME ${VTK40_CMAKE_INSTALL_PREFIX}/lib/vtk/tcl)
- endif(VTK_WRAP_TCL)
+ endif()
if(VTK_WRAP_PYTHON)
set(VTK_WRAP_PYTHON_EXE ${VTK40_CMAKE_INSTALL_PREFIX}/bin/vtkWrapPython)
- endif(VTK_WRAP_PYTHON)
+ endif()
if(VTK_WRAP_JAVA)
set(VTK_PARSE_JAVA_EXE ${VTK40_CMAKE_INSTALL_PREFIX}/bin/vtkParseJava)
set(VTK_WRAP_JAVA_EXE ${VTK40_CMAKE_INSTALL_PREFIX}/bin/vtkWrapJava)
- endif(VTK_WRAP_JAVA)
-endif(EXISTS ${VTK_DIR}/Common)
+ endif()
+endif()
# Add the system include directories last.
set(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS_SYS})
@@ -307,23 +307,23 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# The platform is gcc on cygwin.
set(VTK_REQUIRED_CXX_FLAGS "${VTK_REQUIRED_CXX_FLAGS} -mwin32")
set(VTK_REQUIRED_C_FLAGS "${VTK_REQUIRED_C_FLAGS} -mwin32")
- endif(WIN32)
-else(CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+else()
if(CMAKE_ANSI_CFLAGS)
set(VTK_REQUIRED_C_FLAGS "${VTK_REQUIRED_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
- endif(CMAKE_ANSI_CFLAGS)
+ endif()
if(CMAKE_SYSTEM MATCHES "OSF1-V.*")
set(VTK_REQUIRED_CXX_FLAGS
"${VTK_REQUIRED_CXX_FLAGS} -timplicit_local -no_implicit_include")
- endif(CMAKE_SYSTEM MATCHES "OSF1-V.*")
-endif(CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+endif()
if(VTK_USE_X)
if(CMAKE_X_CFLAGS)
set(VTK_REQUIRED_C_FLAGS "${VTK_REQUIRED_C_FLAGS} ${CMAKE_X_CFLAGS}")
set(VTK_REQUIRED_CXX_FLAGS "${VTK_REQUIRED_CXX_FLAGS} ${CMAKE_X_CFLAGS}")
- endif(CMAKE_X_CFLAGS)
-endif(VTK_USE_X)
+ endif()
+endif()
# Copy library dependencies.
set(vtkCommonJava_LIB_DEPENDS "${VTK40_vtkCommonJava_LIB_DEPENDS}")