Commit 7bbaa428 authored by Kitware Robot's avatar Kitware Robot Committed by Brad King

Remove trailing whitespace from most CMake and C/C++ code

Our Git commit hooks disallow modification or addition of lines with
trailing whitespace.  Wipe out all remnants of trailing whitespace
everywhere except third-party code.

Run the following shell code:

git ls-files -z -- \
 bootstrap doxygen.config '*.readme' \
 '*.c' '*.cmake' '*.cpp' '*.cxx' \
 '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
 '*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
parent be9db989
...@@ -70,12 +70,12 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") ...@@ -70,12 +70,12 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME) IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
# if the CPACK_PACKAGE_FILE_NAME is not defined by the cache # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
# default to source package - system, on cygwin system is not # default to source package - system, on cygwin system is not
# needed # needed
IF(CYGWIN) IF(CYGWIN)
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
ELSE(CYGWIN) ELSE(CYGWIN)
SET(CPACK_PACKAGE_FILE_NAME SET(CPACK_PACKAGE_FILE_NAME
"${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}") "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
ENDIF(CYGWIN) ENDIF(CYGWIN)
ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME) ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
...@@ -102,9 +102,9 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") ...@@ -102,9 +102,9 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
SET(CPACK_CYGWIN_PATCH_NUMBER 1) SET(CPACK_CYGWIN_PATCH_NUMBER 1)
# These files are required by the cmCPackCygwinSourceGenerator and the files # These files are required by the cmCPackCygwinSourceGenerator and the files
# put into the release tar files. # put into the release tar files.
SET(CPACK_CYGWIN_BUILD_SCRIPT SET(CPACK_CYGWIN_BUILD_SCRIPT
"${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.sh") "${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.sh")
SET(CPACK_CYGWIN_PATCH_FILE SET(CPACK_CYGWIN_PATCH_FILE
"${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.patch") "${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.patch")
# include the sub directory cmake file for cygwin that # include the sub directory cmake file for cygwin that
# configures some files and adds some install targets # configures some files and adds some install targets
......
# This file is configured at cmake time, and loaded at cpack time. # This file is configured at cmake time, and loaded at cpack time.
# To pass variables to cpack from cmake, they must be configured # To pass variables to cpack from cmake, they must be configured
# in this file. # in this file.
if(CPACK_GENERATOR MATCHES "NSIS") if(CPACK_GENERATOR MATCHES "NSIS")
SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@") SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
...@@ -45,9 +45,9 @@ if(CPACK_GENERATOR MATCHES "CygwinSource") ...@@ -45,9 +45,9 @@ if(CPACK_GENERATOR MATCHES "CygwinSource")
endif(CPACK_GENERATOR MATCHES "CygwinSource") endif(CPACK_GENERATOR MATCHES "CygwinSource")
if("${CPACK_GENERATOR}" STREQUAL "PackageMaker") if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
if(CMAKE_PACKAGE_QTGUI) if(CMAKE_PACKAGE_QTGUI)
set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications") set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications")
else(CMAKE_PACKAGE_QTGUI) else(CMAKE_PACKAGE_QTGUI)
set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr") set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
endif(CMAKE_PACKAGE_QTGUI) endif(CMAKE_PACKAGE_QTGUI)
endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker") endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
...@@ -114,11 +114,11 @@ MACRO(CMAKE_SETUP_TESTING) ...@@ -114,11 +114,11 @@ MACRO(CMAKE_SETUP_TESTING)
IF (NOT DART_ROOT) IF (NOT DART_ROOT)
SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM}) SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
ENDIF (NOT DART_ROOT) ENDIF (NOT DART_ROOT)
IF(BUILD_TESTING) IF(BUILD_TESTING)
SET(CMAKE_TEST_GENERATOR "" CACHE STRING SET(CMAKE_TEST_GENERATOR "" CACHE STRING
"Generator used when running tests") "Generator used when running tests")
SET(CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH SET(CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH
"Generator used when running tests") "Generator used when running tests")
IF(NOT CMAKE_TEST_GENERATOR) IF(NOT CMAKE_TEST_GENERATOR)
SET(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}") SET(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}")
...@@ -126,7 +126,7 @@ MACRO(CMAKE_SETUP_TESTING) ...@@ -126,7 +126,7 @@ MACRO(CMAKE_SETUP_TESTING)
ELSE(NOT CMAKE_TEST_GENERATOR) ELSE(NOT CMAKE_TEST_GENERATOR)
SET(CMAKE_TEST_DIFFERENT_GENERATOR TRUE) SET(CMAKE_TEST_DIFFERENT_GENERATOR TRUE)
ENDIF(NOT CMAKE_TEST_GENERATOR) ENDIF(NOT CMAKE_TEST_GENERATOR)
# Are we testing with the MSVC compiler? # Are we testing with the MSVC compiler?
SET(CMAKE_TEST_MSVC 0) SET(CMAKE_TEST_MSVC 0)
IF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR) IF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
...@@ -138,14 +138,14 @@ MACRO(CMAKE_SETUP_TESTING) ...@@ -138,14 +138,14 @@ MACRO(CMAKE_SETUP_TESTING)
ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR
"${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio") "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio")
ENDIF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR) ENDIF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
SET(CMAKE_TEST_SYSTEM_LIBRARIES 0) SET(CMAKE_TEST_SYSTEM_LIBRARIES 0)
FOREACH(util CURL EXPAT XMLRPC ZLIB) FOREACH(util CURL EXPAT XMLRPC ZLIB)
IF(CMAKE_USE_SYSTEM_${util}) IF(CMAKE_USE_SYSTEM_${util})
SET(CMAKE_TEST_SYSTEM_LIBRARIES 1) SET(CMAKE_TEST_SYSTEM_LIBRARIES 1)
ENDIF(CMAKE_USE_SYSTEM_${util}) ENDIF(CMAKE_USE_SYSTEM_${util})
ENDFOREACH(util) ENDFOREACH(util)
# This variable is set by cmake, however to # This variable is set by cmake, however to
# test cmake we want to make sure that # test cmake we want to make sure that
# the ctest from this cmake is used for testing # the ctest from this cmake is used for testing
...@@ -169,7 +169,7 @@ MACRO(CMAKE_SETUP_TESTING) ...@@ -169,7 +169,7 @@ MACRO(CMAKE_SETUP_TESTING)
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY) ${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
IF(BUILD_TESTING AND DART_ROOT) IF(BUILD_TESTING AND DART_ROOT)
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif
${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY) ${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
ENDIF(BUILD_TESTING AND DART_ROOT) ENDIF(BUILD_TESTING AND DART_ROOT)
MARK_AS_ADVANCED(DART_ROOT) MARK_AS_ADVANCED(DART_ROOT)
...@@ -253,18 +253,18 @@ MACRO (CMAKE_BUILD_UTILITIES) ...@@ -253,18 +253,18 @@ MACRO (CMAKE_BUILD_UTILITIES)
${CMake_BINARY_DIR}/Utilities ${CMake_BINARY_DIR}/Utilities
${CMake_SOURCE_DIR}/Utilities ${CMake_SOURCE_DIR}/Utilities
) )
# check for the use of system libraries versus builtin ones # check for the use of system libraries versus builtin ones
# (a macro defined in this file) # (a macro defined in this file)
CMAKE_HANDLE_SYSTEM_LIBRARIES() CMAKE_HANDLE_SYSTEM_LIBRARIES()
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# Build zlib library for Curl, CMake, and CTest. # Build zlib library for Curl, CMake, and CTest.
SET(CMAKE_ZLIB_HEADER "cm_zlib.h") SET(CMAKE_ZLIB_HEADER "cm_zlib.h")
IF(CMAKE_USE_SYSTEM_ZLIB) IF(CMAKE_USE_SYSTEM_ZLIB)
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
IF(NOT ZLIB_FOUND) IF(NOT ZLIB_FOUND)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR
"CMAKE_USE_SYSTEM_ZLIB is ON but a zlib is not found!") "CMAKE_USE_SYSTEM_ZLIB is ON but a zlib is not found!")
ENDIF(NOT ZLIB_FOUND) ENDIF(NOT ZLIB_FOUND)
SET(CMAKE_ZLIB_INCLUDES ${ZLIB_INCLUDE_DIR}) SET(CMAKE_ZLIB_INCLUDES ${ZLIB_INCLUDE_DIR})
...@@ -275,13 +275,13 @@ MACRO (CMAKE_BUILD_UTILITIES) ...@@ -275,13 +275,13 @@ MACRO (CMAKE_BUILD_UTILITIES)
ADD_SUBDIRECTORY(Utilities/cmzlib) ADD_SUBDIRECTORY(Utilities/cmzlib)
CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty") CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty")
ENDIF(CMAKE_USE_SYSTEM_ZLIB) ENDIF(CMAKE_USE_SYSTEM_ZLIB)
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# Build Curl library for CTest. # Build Curl library for CTest.
IF(CMAKE_USE_SYSTEM_CURL) IF(CMAKE_USE_SYSTEM_CURL)
FIND_PACKAGE(CURL) FIND_PACKAGE(CURL)
IF(NOT CURL_FOUND) IF(NOT CURL_FOUND)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR
"CMAKE_USE_SYSTEM_CURL is ON but a curl is not found!") "CMAKE_USE_SYSTEM_CURL is ON but a curl is not found!")
ENDIF(NOT CURL_FOUND) ENDIF(NOT CURL_FOUND)
SET(CMAKE_CURL_INCLUDES ${CURL_INCLUDE_DIRS}) SET(CMAKE_CURL_INCLUDES ${CURL_INCLUDE_DIRS})
...@@ -306,7 +306,7 @@ MACRO (CMAKE_BUILD_UTILITIES) ...@@ -306,7 +306,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# Build Compress library for CTest. # Build Compress library for CTest.
SET(CMAKE_COMPRESS_INCLUDES SET(CMAKE_COMPRESS_INCLUDES
"${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress") "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
SET(CMAKE_COMPRESS_LIBRARIES "cmcompress") SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
ADD_SUBDIRECTORY(Utilities/cmcompress) ADD_SUBDIRECTORY(Utilities/cmcompress)
...@@ -314,7 +314,7 @@ MACRO (CMAKE_BUILD_UTILITIES) ...@@ -314,7 +314,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
IF(CMAKE_USE_SYSTEM_BZIP2) IF(CMAKE_USE_SYSTEM_BZIP2)
FIND_PACKAGE(BZip2) FIND_PACKAGE(BZip2)
ELSE() ELSE()
SET(BZIP2_INCLUDE_DIR SET(BZIP2_INCLUDE_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2") "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
SET(BZIP2_LIBRARIES cmbzip2) SET(BZIP2_LIBRARIES cmbzip2)
ADD_SUBDIRECTORY(Utilities/cmbzip2) ADD_SUBDIRECTORY(Utilities/cmbzip2)
...@@ -364,7 +364,7 @@ MACRO (CMAKE_BUILD_UTILITIES) ...@@ -364,7 +364,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
ADD_SUBDIRECTORY(Utilities/cmexpat) ADD_SUBDIRECTORY(Utilities/cmexpat)
CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty") CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
ENDIF(CMAKE_USE_SYSTEM_EXPAT) ENDIF(CMAKE_USE_SYSTEM_EXPAT)
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# Build XMLRPC library for CMake and CTest. # Build XMLRPC library for CMake and CTest.
IF(CTEST_USE_XMLRPC) IF(CTEST_USE_XMLRPC)
...@@ -376,7 +376,7 @@ MACRO (CMAKE_BUILD_UTILITIES) ...@@ -376,7 +376,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
SET(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS}) SET(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS})
SET(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES}) SET(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES})
ENDIF(CTEST_USE_XMLRPC) ENDIF(CTEST_USE_XMLRPC)
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# Use curses? # Use curses?
IF (UNIX) IF (UNIX)
...@@ -454,7 +454,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ...@@ -454,7 +454,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES
# where to write the resulting executables and libraries # where to write the resulting executables and libraries
SET(BUILD_SHARED_LIBS OFF) SET(BUILD_SHARED_LIBS OFF)
SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.") SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.")
SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
"Where to put the libraries for CMake") "Where to put the libraries for CMake")
# The CMake executables usually do not need any rpath to run in the build or # The CMake executables usually do not need any rpath to run in the build or
...@@ -511,12 +511,12 @@ IF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x") ...@@ -511,12 +511,12 @@ IF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
SET(CMAKE_TESTS_CDASH_SERVER "http://www.cdash.org/CDash") SET(CMAKE_TESTS_CDASH_SERVER "http://www.cdash.org/CDash")
ENDIF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x") ENDIF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
# build the utilities (a macro defined in this file) # build the utilities (a macro defined in this file)
CMAKE_BUILD_UTILITIES() CMAKE_BUILD_UTILITIES()
# On NetBSD ncurses is required, since curses doesn't have the wsyncup() # On NetBSD ncurses is required, since curses doesn't have the wsyncup()
# function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib, # function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib,
# which isn't in the default linker search path. So without RPATH ccmake # which isn't in the default linker search path. So without RPATH ccmake
# doesn't run and the build doesn't succeed since ccmake is executed for # doesn't run and the build doesn't succeed since ccmake is executed for
# generating the documentation. # generating the documentation.
IF(BUILD_CursesDialog) IF(BUILD_CursesDialog)
...@@ -539,10 +539,10 @@ IF(BUILD_QtDialog) ...@@ -539,10 +539,10 @@ IF(BUILD_QtDialog)
IF(NOT "${ENDCH}" STREQUAL "/") IF(NOT "${ENDCH}" STREQUAL "/")
SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
ENDIF(NOT "${ENDCH}" STREQUAL "/") ENDIF(NOT "${ENDCH}" STREQUAL "/")
SET(CMAKE_INSTALL_PREFIX SET(CMAKE_INSTALL_PREFIX
"${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents") "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
ENDIF(APPLE) ENDIF(APPLE)
SET(QT_NEED_RPATH FALSE) SET(QT_NEED_RPATH FALSE)
IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64") IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
SET(QT_NEED_RPATH TRUE) SET(QT_NEED_RPATH TRUE)
...@@ -551,7 +551,7 @@ ENDIF(BUILD_QtDialog) ...@@ -551,7 +551,7 @@ ENDIF(BUILD_QtDialog)
# The same might be true on other systems for other libraries. # The same might be true on other systems for other libraries.
# Then only enable RPATH if we have are building at least with cmake 2.4, # Then only enable RPATH if we have are building at least with cmake 2.4,
# since this one has much better RPATH features than cmake 2.2. # since this one has much better RPATH features than cmake 2.2.
# The executables are then built with the RPATH for the libraries outside # The executables are then built with the RPATH for the libraries outside
# the build tree, which is both the build and the install RPATH. # the build tree, which is both the build and the install RPATH.
...@@ -583,7 +583,7 @@ CONFIGURE_FILE( ...@@ -583,7 +583,7 @@ CONFIGURE_FILE(
"${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf" "${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf"
COPYONLY) COPYONLY)
OPTION(CMAKE_STRICT OPTION(CMAKE_STRICT
"Perform strict testing to record property and variable access. Can be used to report any undefined properties or variables" OFF) "Perform strict testing to record property and variable access. Can be used to report any undefined properties or variables" OFF)
MARK_AS_ADVANCED(CMAKE_STRICT) MARK_AS_ADVANCED(CMAKE_STRICT)
...@@ -600,7 +600,7 @@ CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat") ...@@ -600,7 +600,7 @@ CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat")
CMAKE_SET_TARGET_FOLDER(documentation "Documentation") CMAKE_SET_TARGET_FOLDER(documentation "Documentation")
# add a test # add a test
ADD_TEST(SystemInformationNew "${CMAKE_CMAKE_COMMAND}" ADD_TEST(SystemInformationNew "${CMAKE_CMAKE_COMMAND}"
--system-information -G "${CMAKE_TEST_GENERATOR}" ) --system-information -G "${CMAKE_TEST_GENERATOR}" )
# Install license file as it requires. # Install license file as it requires.
......
...@@ -19,7 +19,7 @@ set(CTEST_DROP_SITE_CDASH TRUE) ...@@ -19,7 +19,7 @@ set(CTEST_DROP_SITE_CDASH TRUE)
set(CTEST_CDASH_VERSION "1.6") set(CTEST_CDASH_VERSION "1.6")
set(CTEST_CDASH_QUERY_VERSION TRUE) set(CTEST_CDASH_QUERY_VERSION TRUE)
# use old trigger stuff so that cmake 2.4 and below will not # use old trigger stuff so that cmake 2.4 and below will not
# get errors on trigger # get errors on trigger
SET (TRIGGER_SITE SET (TRIGGER_SITE
"http://public.kitware.com/cgi-bin/Submit-CMake-TestingResults.cgi") "http://public.kitware.com/cgi-bin/Submit-CMake-TestingResults.cgi")
...@@ -27,7 +27,7 @@ ENDIF() ...@@ -27,7 +27,7 @@ ENDIF()
# Disable deprecation warnings for standard C functions. # Disable deprecation warnings for standard C functions.
# really only needed for newer versions of VS, but should # really only needed for newer versions of VS, but should
# not hurt other versions, and this will work into the # not hurt other versions, and this will work into the
# future # future
IF(MSVC OR _INTEL_WINDOWS) IF(MSVC OR _INTEL_WINDOWS)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
...@@ -56,9 +56,9 @@ ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*") ...@@ -56,9 +56,9 @@ ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
# use the ansi CXX compile flag for building cmake # use the ansi CXX compile flag for building cmake
IF (CMAKE_ANSI_CXXFLAGS) IF (CMAKE_ANSI_CXXFLAGS)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")
ENDIF (CMAKE_ANSI_CXXFLAGS) ENDIF (CMAKE_ANSI_CXXFLAGS)
IF (CMAKE_ANSI_CFLAGS) IF (CMAKE_ANSI_CFLAGS)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
ENDIF (CMAKE_ANSI_CFLAGS) ENDIF (CMAKE_ANSI_CFLAGS)
" ============================================================================= " =============================================================================
" "
" Program: CMake - Cross-Platform Makefile Generator " Program: CMake - Cross-Platform Makefile Generator
" Module: $RCSfile$ " Module: $RCSfile$
" Language: VIM " Language: VIM
" Date: $Date$ " Date: $Date$
" Version: $Revision$ " Version: $Revision$
" "
" ============================================================================= " =============================================================================
" Vim indent file " Vim indent file
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
;; cmake executable variable used to run cmake --help-command ;; cmake executable variable used to run cmake --help-command
;; on commands in cmake-mode ;; on commands in cmake-mode
;; ;;
;; cmake-command-help Written by James Bigler ;; cmake-command-help Written by James Bigler
;; ;;
(defcustom cmake-mode-cmake-executable "cmake" (defcustom cmake-mode-cmake-executable "cmake"
...@@ -191,11 +191,11 @@ the indentation. Otherwise it retains the same position on the line" ...@@ -191,11 +191,11 @@ the indentation. Otherwise it retains the same position on the line"
(setq save-point (point)) (setq save-point (point))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t) (while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t)
(replace-match (replace-match
(concat (concat
(match-string 1) (match-string 1)
(downcase (match-string 2)) (downcase (match-string 2))
(match-string 3)) (match-string 3))
t)) t))
(goto-char save-point) (goto-char save-point)
) )
......
...@@ -36,9 +36,9 @@ syn region cmakeVariableValue start=/\${/ end=/}/ ...@@ -36,9 +36,9 @@ syn region cmakeVariableValue start=/\${/ end=/}/
\ contained oneline contains=CONTAINED,cmakeTodo \ contained oneline contains=CONTAINED,cmakeTodo
syn region cmakeEnvironment start=/\$ENV{/ end=/}/ syn region cmakeEnvironment start=/\$ENV{/ end=/}/
\ contained oneline contains=CONTAINED,cmakeTodo \ contained oneline contains=CONTAINED,cmakeTodo
syn region cmakeString start=/"/ end=/"/ syn region cmakeString start=/"/ end=/"/
\ contains=CONTAINED,cmakeTodo,cmakeOperators \ contains=CONTAINED,cmakeTodo,cmakeOperators
syn region cmakeArguments start=/(/ end=/)/ syn region cmakeArguments start=/(/ end=/)/
\ contains=ALLBUT,cmakeArguments,cmakeTodo \ contains=ALLBUT,cmakeArguments,cmakeTodo
syn keyword cmakeSystemVariables syn keyword cmakeSystemVariables
\ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 \ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 MSVC90
...@@ -49,11 +49,11 @@ syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_ ...@@ -49,11 +49,11 @@ syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_
\ nextgroup=cmakeArguments \ nextgroup=cmakeArguments
" The keywords are generated as: cmake --help-command-list | tr "\n" " " " The keywords are generated as: cmake --help-command-list | tr "\n" " "
syn keyword cmakeStatement syn keyword cmakeStatement
\ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE
\ nextgroup=cmakeArguments \ nextgroup=cmakeArguments
syn keyword cmakeTodo syn keyword cmakeTodo
\ TODO FIXME XXX \ TODO FIXME XXX
\ contained \ contained
" Define the default highlighting. " Define the default highlighting.
......
...@@ -5,6 +5,6 @@ extern Hello hello; ...@@ -5,6 +5,6 @@ extern Hello hello;
int main() int main()
{ {
hello.Print(); hello.Print();
return 0; return 0;
} }
CMakeDetermine(LANG)Compiler.cmake -> this should find the compiler for LANG and configure CMake(LANG)Compiler.cmake.in CMakeDetermine(LANG)Compiler.cmake -> this should find the compiler for LANG and configure CMake(LANG)Compiler.cmake.in
CMake(LANG)Compiler.cmake.in -> used by CMakeDetermine(LANG)Compiler.cmake CMake(LANG)Compiler.cmake.in -> used by CMakeDetermine(LANG)Compiler.cmake
This file is used to store compiler information and is copied down into try This file is used to store compiler information and is copied down into try
compile directories so that try compiles do not need to re-determine and test the LANG compile directories so that try compiles do not need to re-determine and test the LANG
CMakeTest(LANG)Compiler.cmake -> test the compiler and set: CMakeTest(LANG)Compiler.cmake -> test the compiler and set:
......
...@@ -67,7 +67,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) ...@@ -67,7 +67,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
INCLUDE (FindThreads) INCLUDE (FindThreads)
SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING
"Thread library used.") "Thread library used.")
SET (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS_INIT}" CACHE BOOL SET (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS_INIT}" CACHE BOOL
...@@ -79,7 +79,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) ...@@ -79,7 +79,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
SET (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS_INIT} CACHE BOOL SET (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS_INIT} CACHE BOOL
"Use HP pthreads.") "Use HP pthreads.")
SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL
"Use sproc libs.") "Use sproc libs.")
IF(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) IF(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
......
# - define a bunch of backwards compatibility variables # - define a bunch of backwards compatibility variables
# CMAKE_ANSI_CXXFLAGS - flag for ansi c++ # CMAKE_ANSI_CXXFLAGS - flag for ansi c++
# CMAKE_HAS_ANSI_STRING_STREAM - has <strstream> # CMAKE_HAS_ANSI_STRING_STREAM - has <strstream>
# INCLUDE(TestForANSIStreamHeaders) # INCLUDE(TestForANSIStreamHeaders)
# INCLUDE(CheckIncludeFileCXX) # INCLUDE(CheckIncludeFileCXX)
...@@ -37,7 +37,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) ...@@ -37,7 +37,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
# if the compiler liked the flag then set CMAKE_ANSI_CXXFLAGS # if the compiler liked the flag then set CMAKE_ANSI_CXXFLAGS
# to the flag # to the flag
IF(CMAKE_CXX_ACCEPTS_FLAGS) IF(CMAKE_CXX_ACCEPTS_FLAGS)
SET(CMAKE_ANSI_CXXFLAGS ${CMAKE_TRY_ANSI_CXX_FLAGS} CACHE INTERNAL SET(CMAKE_ANSI_CXXFLAGS ${CMAKE_TRY_ANSI_CXX_FLAGS} CACHE INTERNAL
"What flags are required by the c++ compiler to make it ansi." ) "What flags are required by the c++ compiler to make it ansi." )
ENDIF(CMAKE_CXX_ACCEPTS_FLAGS) ENDIF(CMAKE_CXX_ACCEPTS_FLAGS)
ENDIF( CMAKE_TRY_ANSI_CXX_FLAGS MATCHES ".+") ENDIF( CMAKE_TRY_ANSI_CXX_FLAGS MATCHES ".+")
......
...@@ -57,7 +57,7 @@ IF(CMAKE_C_COMPILER_ID) ...@@ -57,7 +57,7 @@ IF(CMAKE_C_COMPILER_ID)
OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF(CMAKE_C_COMPILER_ID) ENDIF(CMAKE_C_COMPILER_ID)
IF (NOT _INCLUDED_FILE) IF (NOT _INCLUDED_FILE)
INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}
OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF (NOT _INCLUDED_FILE) ENDIF (NOT _INCLUDED_FILE)
# We specify the compiler information in the system file for some # We specify the compiler information in the system file for some
...@@ -76,7 +76,7 @@ IF(CMAKE_C_SIZEOF_DATA_PTR) ...@@ -76,7 +76,7 @@ IF(CMAKE_C_SIZEOF_DATA_PTR)
ENDIF() ENDIF()
# This should be included before the _INIT variables are # This should be included before the _INIT variables are
# used to initialize the cache. Since the rule variables # used to initialize the cache. Since the rule variables
# have if blocks on them, users can still define them here. # have if blocks on them, users can still define them here.
# But, it should still be after the platform file so changes can # But, it should still be after the platform file so changes can
# be made to those values. # be made to those values.
...@@ -103,7 +103,7 @@ IF(NOT CMAKE_MODULE_EXISTS) ...@@ -103,7 +103,7 @@ IF(NOT CMAKE_MODULE_EXISTS)
ENDIF(NOT CMAKE_MODULE_EXISTS) ENDIF(NOT CMAKE_MODULE_EXISTS)
SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}") SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
# avoid just having a space as the initial value for the cache # avoid just having a space as the initial value for the cache
IF(CMAKE_C_FLAGS_INIT STREQUAL " ") IF(CMAKE_C_FLAGS_INIT STREQUAL " ")
SET(CMAKE_C_FLAGS_INIT) SET(CMAKE_C_FLAGS_INIT)