Imported Upstream version 2.8.10.2upstream/2.8.10.2

5 files changed, 40 insertions, 40 deletions

diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt
index 9cfbe25ce..6822e6bd9 100644
--- a/Tests/SubDir/CMakeLists.txt
+++ b/Tests/SubDir/CMakeLists.txt
@@ -1,46 +1,46 @@
 cmake_minimum_required (VERSION 2.6)
-PROJECT(SUBDIR)
-SUBDIRS(Executable EXCLUDE_FROM_ALL Examples)
-WRITE_FILE(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
+project(SUBDIR)
+subdirs(Executable EXCLUDE_FROM_ALL Examples)
+write_file(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
 #WATCOM WMAKE does not support + in the name of a file!
-IF(WATCOM)
-  SET(PLUS_NAME_FILES 
+if(WATCOM)
+  set(PLUS_NAME_FILES
     AnotherSubdir/pair_int.int.c
     vcl_algorithm_vcl_pair_double.foo.c)
-ELSE(WATCOM)
-    SET(PLUS_NAME_FILES 
+else()
+    set(PLUS_NAME_FILES
     AnotherSubdir/pair+int.int.c
     vcl_algorithm+vcl_pair+double.foo.c)
-ENDIF(WATCOM)
+endif()
 
-ADD_EXECUTABLE(TestFromSubdir
+add_executable(TestFromSubdir
   AnotherSubdir/testfromsubdir.c
   AnotherSubdir/secondone
   ${PLUS_NAME_FILES}
   )
 
-AUX_SOURCE_DIRECTORY(ThirdSubDir SOURCES)
-IF(WATCOM)
-  FOREACH(f ${SOURCES})
-    IF("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c")
-    ELSE("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c")
-      SET(SOURCES2 ${f} ${SOURCES2})
-    ENDIF("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c")
-  ENDFOREACH(f)
-  SET(SOURCES ${SOURCES2})
-  SET(SOURCES ${SOURCES} 
+aux_source_directory(ThirdSubDir SOURCES)
+if(WATCOM)
+  foreach(f ${SOURCES})
+    if("${f}" STREQUAL "ThirdSubDir/pair+int.int1.c")
+    else()
+      set(SOURCES2 ${f} ${SOURCES2})
+    endif()
+  endforeach()
+  set(SOURCES ${SOURCES2})
+  set(SOURCES ${SOURCES}
     vcl_algorithm_vcl_pair_double.foo.c)
-ELSE(WATCOM)
-  FOREACH(f ${SOURCES})
-    IF("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c")
-    ELSE("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c")
-      SET(SOURCES2 ${f} ${SOURCES2})
-      MESSAGE("${f}")
-    ENDIF("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c")
-  ENDFOREACH(f)
-  SET(SOURCES ${SOURCES2})
-  SET(SOURCES ${SOURCES} 
+else()
+  foreach(f ${SOURCES})
+    if("${f}" STREQUAL "ThirdSubDir/pair_int.int1.c")
+    else()
+      set(SOURCES2 ${f} ${SOURCES2})
+      message("${f}")
+    endif()
+  endforeach()
+  set(SOURCES ${SOURCES2})
+  set(SOURCES ${SOURCES}
     vcl_algorithm+vcl_pair+double.foo.c)
-ENDIF(WATCOM)  
-MESSAGE("Sources: ${SOURCES}")
-ADD_EXECUTABLE(TestWithAuxSourceDir ${SOURCES})
+endif()
+message("Sources: ${SOURCES}")
+add_executable(TestWithAuxSourceDir ${SOURCES})
diff --git a/Tests/SubDir/Examples/CMakeLists.txt b/Tests/SubDir/Examples/CMakeLists.txt
index b0f1e896c..8cd7e24e1 100644
--- a/Tests/SubDir/Examples/CMakeLists.txt
+++ b/Tests/SubDir/Examples/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required (VERSION 2.6)
-PROJECT(Examples)
-SUBDIRS(example1 example2)
+project(Examples)
+subdirs(example1 example2)
diff --git a/Tests/SubDir/Examples/example1/CMakeLists.txt b/Tests/SubDir/Examples/example1/CMakeLists.txt
index 303618321..20d065e54 100644
--- a/Tests/SubDir/Examples/example1/CMakeLists.txt
+++ b/Tests/SubDir/Examples/example1/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
-PROJECT(example1)
-ADD_EXECUTABLE(example1 example1.cxx)
+project(example1)
+add_executable(example1 example1.cxx)
 
-ADD_CUSTOM_COMMAND(TARGET example1 POST_BUILD
+add_custom_command(TARGET example1 POST_BUILD
   COMMAND "${CMAKE_COMMAND}" ARGS -E remove ${SUBDIR_BINARY_DIR}/ShouldBeHere
   COMMENT "Remove marker file that should exist because this should not be run")
diff --git a/Tests/SubDir/Examples/example2/CMakeLists.txt b/Tests/SubDir/Examples/example2/CMakeLists.txt
index 19a537686..388e33c3d 100644
--- a/Tests/SubDir/Examples/example2/CMakeLists.txt
+++ b/Tests/SubDir/Examples/example2/CMakeLists.txt
@@ -1,2 +1,2 @@
-PROJECT(example2)
-ADD_EXECUTABLE(example2 example2.cxx)
+project(example2)
+add_executable(example2 example2.cxx)
diff --git a/Tests/SubDir/Executable/CMakeLists.txt b/Tests/SubDir/Executable/CMakeLists.txt
index d679168d8..77e6751cd 100644
--- a/Tests/SubDir/Executable/CMakeLists.txt
+++ b/Tests/SubDir/Executable/CMakeLists.txt
@@ -1 +1 @@
-ADD_EXECUTABLE(test test.cxx)
+add_executable(test test.cxx)