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/Dependency | |
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/Dependency')
-rw-r--r-- | Tests/Dependency/1/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/CMakeLists.txt | 40 | ||||
-rw-r--r-- | Tests/Dependency/Eight/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Exec/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Exec2/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Exec3/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Exec4/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Five/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Four/CMakeLists.txt | 8 | ||||
-rw-r--r-- | Tests/Dependency/NoDepA/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/Dependency/NoDepB/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/Dependency/NoDepC/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/Dependency/Seven/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Six/CMakeLists.txt | 10 | ||||
-rw-r--r-- | Tests/Dependency/Three/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Dependency/Two/CMakeLists.txt | 16 |
16 files changed, 58 insertions, 58 deletions
diff --git a/Tests/Dependency/1/CMakeLists.txt b/Tests/Dependency/1/CMakeLists.txt index b50b2e9..a8e74e4 100644 --- a/Tests/Dependency/1/CMakeLists.txt +++ b/Tests/Dependency/1/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( One OneSrc.c ) +add_library( One OneSrc.c ) # This library has no dependencies -TARGET_LINK_LIBRARIES( One "" ) +target_link_libraries( One "" ) diff --git a/Tests/Dependency/CMakeLists.txt b/Tests/Dependency/CMakeLists.txt index 86e128f..ef42048 100644 --- a/Tests/Dependency/CMakeLists.txt +++ b/Tests/Dependency/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 2.6) -PROJECT( Dependency ) +project( Dependency ) # to test directories with only one character One was changed to 1 # There is one executable that depends on eight libraries. The @@ -29,25 +29,25 @@ PROJECT( Dependency ) # Although SixB does not depend on Two, there is a dependency listed # in the corresponding CMakeLists.txt just because of commands used. -ADD_SUBDIRECTORY(NoDepA) -ADD_SUBDIRECTORY(NoDepB) -ADD_SUBDIRECTORY(NoDepC) -ADD_SUBDIRECTORY(1) -ADD_SUBDIRECTORY(Two) -ADD_SUBDIRECTORY(Three) -ADD_SUBDIRECTORY(Four) -ADD_SUBDIRECTORY(Five) -ADD_SUBDIRECTORY(Six) -ADD_SUBDIRECTORY(Seven) -ADD_SUBDIRECTORY(Eight) -ADD_SUBDIRECTORY(Exec) -ADD_SUBDIRECTORY(Exec2) -ADD_SUBDIRECTORY(Exec3) -ADD_SUBDIRECTORY(Exec4) +add_subdirectory(NoDepA) +add_subdirectory(NoDepB) +add_subdirectory(NoDepC) +add_subdirectory(1) +add_subdirectory(Two) +add_subdirectory(Three) +add_subdirectory(Four) +add_subdirectory(Five) +add_subdirectory(Six) +add_subdirectory(Seven) +add_subdirectory(Eight) +add_subdirectory(Exec) +add_subdirectory(Exec2) +add_subdirectory(Exec3) +add_subdirectory(Exec4) # Specific cases added to test fixes to problems found in real # projects. -ADD_SUBDIRECTORY(Case1) -ADD_SUBDIRECTORY(Case2) -ADD_SUBDIRECTORY(Case3) -ADD_SUBDIRECTORY(Case4) +add_subdirectory(Case1) +add_subdirectory(Case2) +add_subdirectory(Case3) +add_subdirectory(Case4) diff --git a/Tests/Dependency/Eight/CMakeLists.txt b/Tests/Dependency/Eight/CMakeLists.txt index 5d8e756..db5e2df 100644 --- a/Tests/Dependency/Eight/CMakeLists.txt +++ b/Tests/Dependency/Eight/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( Eight EightSrc.c ) -TARGET_LINK_LIBRARIES( Eight Seven ) +add_library( Eight EightSrc.c ) +target_link_libraries( Eight Seven ) diff --git a/Tests/Dependency/Exec/CMakeLists.txt b/Tests/Dependency/Exec/CMakeLists.txt index 97fffe7..a920685 100644 --- a/Tests/Dependency/Exec/CMakeLists.txt +++ b/Tests/Dependency/Exec/CMakeLists.txt @@ -1,7 +1,7 @@ # This executable directly depends on NoDepB, NoDepC, SixA and SixB. However, # since NoDepB and NoDepC do not have explicit dependency information, # and they depend on NoDepA, we have to manually specify that dependency. -LINK_LIBRARIES( NoDepB NoDepC NoDepA SixB SixA ) +link_libraries( NoDepB NoDepC NoDepA SixB SixA ) -ADD_EXECUTABLE( exec ExecMain.c ) +add_executable( exec ExecMain.c ) diff --git a/Tests/Dependency/Exec2/CMakeLists.txt b/Tests/Dependency/Exec2/CMakeLists.txt index 84d630a..04d6fe8 100644 --- a/Tests/Dependency/Exec2/CMakeLists.txt +++ b/Tests/Dependency/Exec2/CMakeLists.txt @@ -6,7 +6,7 @@ # Now, we must make sure that Seven gets inserted between Five and Two, and # not at the end. Unfortunately, if we get it wrong, the test will only # fail on a platform where the link order makes a difference. -LINK_LIBRARIES( Eight Five ) +link_libraries( Eight Five ) -ADD_EXECUTABLE( exec2 ExecMain.c ) +add_executable( exec2 ExecMain.c ) diff --git a/Tests/Dependency/Exec3/CMakeLists.txt b/Tests/Dependency/Exec3/CMakeLists.txt index b33e732..605fbc9 100644 --- a/Tests/Dependency/Exec3/CMakeLists.txt +++ b/Tests/Dependency/Exec3/CMakeLists.txt @@ -1,6 +1,6 @@ # Here, Five already has it's immediate dependency, Two satisfied. We must # make sure Two gets output anyway, because Eight indirectly depends on it. -LINK_LIBRARIES( Five Two Eight Five ) +link_libraries( Five Two Eight Five ) -ADD_EXECUTABLE( exec3 ExecMain.c ) +add_executable( exec3 ExecMain.c ) diff --git a/Tests/Dependency/Exec4/CMakeLists.txt b/Tests/Dependency/Exec4/CMakeLists.txt index 6fcb153..94c6bf5 100644 --- a/Tests/Dependency/Exec4/CMakeLists.txt +++ b/Tests/Dependency/Exec4/CMakeLists.txt @@ -1,6 +1,6 @@ # Even though Five's dependency on Two is explicitly satisfied, Two # must be emitted again in order to satisfy a cyclic dependency on Three. -LINK_LIBRARIES( Five Two Five ) +link_libraries( Five Two Five ) -ADD_EXECUTABLE( exec4 ExecMain.c ) +add_executable( exec4 ExecMain.c ) diff --git a/Tests/Dependency/Five/CMakeLists.txt b/Tests/Dependency/Five/CMakeLists.txt index 27f6a1f..19c1c77 100644 --- a/Tests/Dependency/Five/CMakeLists.txt +++ b/Tests/Dependency/Five/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( Five FiveSrc.c ) -TARGET_LINK_LIBRARIES( Five Two ) +add_library( Five FiveSrc.c ) +target_link_libraries( Five Two ) diff --git a/Tests/Dependency/Four/CMakeLists.txt b/Tests/Dependency/Four/CMakeLists.txt index df0f162..71c531f 100644 --- a/Tests/Dependency/Four/CMakeLists.txt +++ b/Tests/Dependency/Four/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES(${Dependency_BINARY_DIR}/Two) -ADD_LIBRARY( Four FourSrc.c ) -TARGET_LINK_LIBRARIES( Four One Two NoDepA ) +include_directories(${Dependency_BINARY_DIR}/Two) +add_library( Four FourSrc.c ) +target_link_libraries( Four One Two NoDepA ) # TwoCustom must build before Four. -ADD_DEPENDENCIES(Four TwoCustom) +add_dependencies(Four TwoCustom) diff --git a/Tests/Dependency/NoDepA/CMakeLists.txt b/Tests/Dependency/NoDepA/CMakeLists.txt index cedf185..543402d 100644 --- a/Tests/Dependency/NoDepA/CMakeLists.txt +++ b/Tests/Dependency/NoDepA/CMakeLists.txt @@ -1 +1 @@ -ADD_LIBRARY( NoDepA NoDepASrc.c ) +add_library( NoDepA NoDepASrc.c ) diff --git a/Tests/Dependency/NoDepB/CMakeLists.txt b/Tests/Dependency/NoDepB/CMakeLists.txt index 0d69f68..1c70f37 100644 --- a/Tests/Dependency/NoDepB/CMakeLists.txt +++ b/Tests/Dependency/NoDepB/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( NoDepB NoDepBSrc.c ) +add_library( NoDepB NoDepBSrc.c ) # This library depends on NoDepA, but the # dependency is not explicitly specified. diff --git a/Tests/Dependency/NoDepC/CMakeLists.txt b/Tests/Dependency/NoDepC/CMakeLists.txt index 88b29ba..dd41ceb 100644 --- a/Tests/Dependency/NoDepC/CMakeLists.txt +++ b/Tests/Dependency/NoDepC/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( NoDepC NoDepCSrc.c ) +add_library( NoDepC NoDepCSrc.c ) # This library depends on NoDepA, but the # dependency is not explicitly specified. diff --git a/Tests/Dependency/Seven/CMakeLists.txt b/Tests/Dependency/Seven/CMakeLists.txt index 51a38d8..7fba55c 100644 --- a/Tests/Dependency/Seven/CMakeLists.txt +++ b/Tests/Dependency/Seven/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( Seven SevenSrc.c ) -TARGET_LINK_LIBRARIES( Seven Two ) +add_library( Seven SevenSrc.c ) +target_link_libraries( Seven Two ) diff --git a/Tests/Dependency/Six/CMakeLists.txt b/Tests/Dependency/Six/CMakeLists.txt index d0abdd6..db12051 100644 --- a/Tests/Dependency/Six/CMakeLists.txt +++ b/Tests/Dependency/Six/CMakeLists.txt @@ -2,11 +2,11 @@ # use an all-encompassing LINK_LIBRARIES. And sometimes they don't # specify them in the correct order. -LINK_LIBRARIES( Two ) -LINK_LIBRARIES( Five ) +link_libraries( Two ) +link_libraries( Five ) -ADD_LIBRARY( SixA SixASrc.c ) +add_library( SixA SixASrc.c ) -ADD_LIBRARY( SixB SixBSrc.c ) -TARGET_LINK_LIBRARIES( SixB Four ) +add_library( SixB SixBSrc.c ) +target_link_libraries( SixB Four ) diff --git a/Tests/Dependency/Three/CMakeLists.txt b/Tests/Dependency/Three/CMakeLists.txt index 6b20dcb..3897f0c 100644 --- a/Tests/Dependency/Three/CMakeLists.txt +++ b/Tests/Dependency/Three/CMakeLists.txt @@ -1,3 +1,3 @@ -ADD_LIBRARY( Three ThreeSrc.c ) -TARGET_LINK_LIBRARIES( Three One Four ) +add_library( Three ThreeSrc.c ) +target_link_libraries( Three One Four ) diff --git a/Tests/Dependency/Two/CMakeLists.txt b/Tests/Dependency/Two/CMakeLists.txt index 587c848..19a0703 100644 --- a/Tests/Dependency/Two/CMakeLists.txt +++ b/Tests/Dependency/Two/CMakeLists.txt @@ -1,20 +1,20 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY( Two TwoSrc.c ) -TARGET_LINK_LIBRARIES( Two Three ) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) +add_library( Two TwoSrc.c ) +target_link_libraries( Two Three ) # Setup a target to cause failure if Two does not depend on it or if # Two actually links to it. This will test that a utility dependency # on a library target works properly. -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/two-test.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/two-test.h.in ${CMAKE_CURRENT_BINARY_DIR}/two-test.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/two-test.h.in ) -ADD_LIBRARY( TwoCustom TwoCustomSrc.c ${CMAKE_CURRENT_BINARY_DIR}/two-test.h) -SET_TARGET_PROPERTIES(TwoCustom PROPERTIES EXCLUDE_FROM_ALL 1) -TARGET_LINK_LIBRARIES(TwoCustom Three) +add_library( TwoCustom TwoCustomSrc.c ${CMAKE_CURRENT_BINARY_DIR}/two-test.h) +set_target_properties(TwoCustom PROPERTIES EXCLUDE_FROM_ALL 1) +target_link_libraries(TwoCustom Three) # Add a utility dependency to make sure it works without linking. -ADD_DEPENDENCIES(Two TwoCustom) +add_dependencies(Two TwoCustom) |