diff options
author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:47:32 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
commit | 77543bde41b0e52c3959016698b529835945d62d (patch) | |
tree | ff63e5fbec326c4a5d821e7496c6d2cb52f75b92 /Tests/ExternalOBJ | |
parent | 7bbaa4283de26864b2e55e819db0884771585467 (diff) | |
download | CMake-77543bde41b0e52c3959016698b529835945d62d.zip CMake-77543bde41b0e52c3959016698b529835945d62d.tar.gz CMake-77543bde41b0e52c3959016698b529835945d62d.tar.bz2 |
Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands. Later command
names became case-insensitive. Now the preferred style is lower-case.
Run the following shell code:
cmake --help-command-list |
grep -v "cmake version" |
while read c; do
echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Tests/ExternalOBJ')
-rw-r--r-- | Tests/ExternalOBJ/CMakeLists.txt | 54 | ||||
-rw-r--r-- | Tests/ExternalOBJ/Object/CMakeLists.txt | 18 |
2 files changed, 36 insertions, 36 deletions
diff --git a/Tests/ExternalOBJ/CMakeLists.txt b/Tests/ExternalOBJ/CMakeLists.txt index 683e799..542bfab 100644 --- a/Tests/ExternalOBJ/CMakeLists.txt +++ b/Tests/ExternalOBJ/CMakeLists.txt @@ -1,51 +1,51 @@ cmake_minimum_required (VERSION 2.6) -PROJECT (ExternalOBJ) +project (ExternalOBJ) -IF(APPLE) +if(APPLE) # set _CMAKE_OSX_MACHINE to umame -m - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE _CMAKE_OSX_MACHINE) + exec_program(uname ARGS -m OUTPUT_VARIABLE _CMAKE_OSX_MACHINE) # check for Power PC and change to ppc - IF("${_CMAKE_OSX_MACHINE}" MATCHES "Power") - SET(_CMAKE_OSX_MACHINE ppc) - ENDIF("${_CMAKE_OSX_MACHINE}" MATCHES "Power") - SET(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}) -ENDIF(APPLE) + if("${_CMAKE_OSX_MACHINE}" MATCHES "Power") + set(_CMAKE_OSX_MACHINE ppc) + endif("${_CMAKE_OSX_MACHINE}" MATCHES "Power") + set(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}) +endif(APPLE) # Build the external object file. -TRY_COMPILE(EXTERNAL_OBJECT_BUILT +try_compile(EXTERNAL_OBJECT_BUILT ${ExternalOBJ_BINARY_DIR}/Object ${ExternalOBJ_SOURCE_DIR}/Object Object external OUTPUT_VARIABLE OUTPUT ) -IF(EXTERNAL_OBJECT_BUILT) - MESSAGE( +if(EXTERNAL_OBJECT_BUILT) + message( "Building external_object.cxx succeeded with the following output:\n" "[${OUTPUT}]" ) -ELSE(EXTERNAL_OBJECT_BUILT) - MESSAGE(FATAL_ERROR +else(EXTERNAL_OBJECT_BUILT) + message(FATAL_ERROR "Building external_object.cxx failed with the following output:\n" "[${OUTPUT}]" ) -ENDIF(EXTERNAL_OBJECT_BUILT) +endif(EXTERNAL_OBJECT_BUILT) # Find the external object file. -SET(DIR ${ExternalOBJ_BINARY_DIR}/Object) -FILE(GLOB_RECURSE EXTERNAL_OBJECT +set(DIR ${ExternalOBJ_BINARY_DIR}/Object) +file(GLOB_RECURSE EXTERNAL_OBJECT "${DIR}/external_object*${CMAKE_CXX_OUTPUT_EXTENSION}") -IF(EXTERNAL_OBJECT) - LIST (GET EXTERNAL_OBJECT 0 EXTERNAL_OBJECT) - MESSAGE("Found \"${EXTERNAL_OBJECT}\".") -ELSE(EXTERNAL_OBJECT) - MESSAGE(FATAL_ERROR "Could not find external object.") -ENDIF(EXTERNAL_OBJECT) +if(EXTERNAL_OBJECT) + list (GET EXTERNAL_OBJECT 0 EXTERNAL_OBJECT) + message("Found \"${EXTERNAL_OBJECT}\".") +else(EXTERNAL_OBJECT) + message(FATAL_ERROR "Could not find external object.") +endif(EXTERNAL_OBJECT) # Test creation of external objects by custom commands. -SET(CUSTOM_OBJECT +set(CUSTOM_OBJECT ${CMAKE_CURRENT_BINARY_DIR}/custom_object${CMAKE_C_OUTPUT_EXTENSION}) -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${CUSTOM_OBJECT} COMMAND ${CMAKE_COMMAND} -E copy ${EXTERNAL_OBJECT} ${CUSTOM_OBJECT} DEPENDS ${EXTERNAL_OBJECT} @@ -53,11 +53,11 @@ ADD_CUSTOM_COMMAND( message("${EXTERNAL_OBJECT}") # Build an executable using the external object file. -ADD_EXECUTABLE(ExternalOBJ executable.cxx ${CUSTOM_OBJECT}) +add_executable(ExternalOBJ executable.cxx ${CUSTOM_OBJECT}) # A bug showed up in VS2010 where an object file that was # part of a custom commad output worked, but ones that were # not didn't work. So, repeat the executable using the object # directly and not from the output of the copy. -ADD_EXECUTABLE(ExternalOBJ2 executable.cxx ${EXTERNAL_OBJECT}) +add_executable(ExternalOBJ2 executable.cxx ${EXTERNAL_OBJECT}) -ADD_SUBDIRECTORY(Sub) +add_subdirectory(Sub) diff --git a/Tests/ExternalOBJ/Object/CMakeLists.txt b/Tests/ExternalOBJ/Object/CMakeLists.txt index 6f1d7e3..b24e91b 100644 --- a/Tests/ExternalOBJ/Object/CMakeLists.txt +++ b/Tests/ExternalOBJ/Object/CMakeLists.txt @@ -1,13 +1,13 @@ cmake_minimum_required (VERSION 2.6) -PROJECT(Object) -IF(APPLE) +project(Object) +if(APPLE) # set _CMAKE_OSX_MACHINE to umame -m - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE _CMAKE_OSX_MACHINE) + exec_program(uname ARGS -m OUTPUT_VARIABLE _CMAKE_OSX_MACHINE) # check for Power PC and change to ppc - IF("${_CMAKE_OSX_MACHINE}" MATCHES "Power") - SET(_CMAKE_OSX_MACHINE ppc) - ENDIF("${_CMAKE_OSX_MACHINE}" MATCHES "Power") - SET(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}) -ENDIF(APPLE) + if("${_CMAKE_OSX_MACHINE}" MATCHES "Power") + set(_CMAKE_OSX_MACHINE ppc) + endif("${_CMAKE_OSX_MACHINE}" MATCHES "Power") + set(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}) +endif(APPLE) -ADD_EXECUTABLE(external external_object.cxx external_main.cxx) +add_executable(external external_object.cxx external_main.cxx) |