summaryrefslogtreecommitdiff
path: root/Tests/SubDirSpaces
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/SubDirSpaces')
-rw-r--r--Tests/SubDirSpaces/CMakeLists.txt84
-rw-r--r--Tests/SubDirSpaces/Executable Sources/CMakeLists.txt2
-rw-r--r--Tests/SubDirSpaces/Executable/CMakeLists.txt2
-rw-r--r--Tests/SubDirSpaces/Some Examples/CMakeLists.txt4
-rw-r--r--Tests/SubDirSpaces/Some Examples/example1/CMakeLists.txt6
-rw-r--r--Tests/SubDirSpaces/Some Examples/example2/CMakeLists.txt4
6 files changed, 51 insertions, 51 deletions
diff --git a/Tests/SubDirSpaces/CMakeLists.txt b/Tests/SubDirSpaces/CMakeLists.txt
index 879530b..69f1d68 100644
--- a/Tests/SubDirSpaces/CMakeLists.txt
+++ b/Tests/SubDirSpaces/CMakeLists.txt
@@ -1,16 +1,16 @@
cmake_minimum_required (VERSION 2.6)
-PROJECT(SUBDIR)
+project(SUBDIR)
# Some systems do not seem to support rpath with spaces.
-IF("${CMAKE_SYSTEM}" MATCHES "IRIX|QNX")
- SET(CMAKE_SKIP_BUILD_RPATH 1)
-ENDIF("${CMAKE_SYSTEM}" MATCHES "IRIX|QNX")
+if("${CMAKE_SYSTEM}" MATCHES "IRIX|QNX")
+ set(CMAKE_SKIP_BUILD_RPATH 1)
+endif()
# be able to see output from make on dashboards
-SET(CMAKE_VERBOSE_MAKEFILE 1)
+set(CMAKE_VERBOSE_MAKEFILE 1)
message("${CMAKE_MAKE_PROGRAM}")
set(CMAKE_PAREN TRUE)
-IF("${CMAKE_MAKE_PROGRAM}" MATCHES "wmake")
+if("${CMAKE_MAKE_PROGRAM}" MATCHES "wmake")
message("wmake does not support () in path")
set(CMAKE_PAREN FALSE)
elseif("${CMAKE_MAKE_PROGRAM}" MATCHES "make")
@@ -23,55 +23,55 @@ elseif("${CMAKE_MAKE_PROGRAM}" MATCHES "make")
endif()
endif()
-IF(CMAKE_PAREN)
- ADD_DEFINITIONS(-DCMAKE_PAREN=1)
- SUBDIRS("Executable Sources" "Some(x86) Sources" EXCLUDE_FROM_ALL "Some Examples")
-ELSE(CMAKE_PAREN)
- SUBDIRS("Executable Sources" EXCLUDE_FROM_ALL "Some Examples")
-ENDIF(CMAKE_PAREN)
+if(CMAKE_PAREN)
+ add_definitions(-DCMAKE_PAREN=1)
+ subdirs("Executable Sources" "Some(x86) Sources" EXCLUDE_FROM_ALL "Some Examples")
+else()
+ subdirs("Executable Sources" EXCLUDE_FROM_ALL "Some Examples")
+endif()
-WRITE_FILE(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.")
+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
"Another Subdir/pair_int.int.c"
vcl_algorithm_vcl_pair_double.foo.c)
-ELSE(WATCOM)
- SET(PLUS_NAME_FILES
+else()
+ set(PLUS_NAME_FILES
"Another Subdir/pair+int.int.c"
vcl_algorithm+vcl_pair+double.foo.c)
-ENDIF(WATCOM)
+endif()
-ADD_EXECUTABLE(TestFromSubdir
+add_executable(TestFromSubdir
"Another Subdir/testfromsubdir.c"
"Another Subdir/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})
- 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})
+ endif()
+ endforeach()
+ set(SOURCES ${SOURCES2})
+ set(SOURCES ${SOURCES}
vcl_algorithm+vcl_pair+double.foo.c)
-ENDIF(WATCOM)
-ADD_EXECUTABLE(TestWithAuxSourceDir ${SOURCES})
-IF(CMAKE_PAREN)
+endif()
+add_executable(TestWithAuxSourceDir ${SOURCES})
+if(CMAKE_PAREN)
target_link_libraries(TestWithAuxSourceDir testOddPath)
-ENDIF(CMAKE_PAREN)
+endif()
diff --git a/Tests/SubDirSpaces/Executable Sources/CMakeLists.txt b/Tests/SubDirSpaces/Executable Sources/CMakeLists.txt
index d679168..77e6751 100644
--- a/Tests/SubDirSpaces/Executable Sources/CMakeLists.txt
+++ b/Tests/SubDirSpaces/Executable Sources/CMakeLists.txt
@@ -1 +1 @@
-ADD_EXECUTABLE(test test.cxx)
+add_executable(test test.cxx)
diff --git a/Tests/SubDirSpaces/Executable/CMakeLists.txt b/Tests/SubDirSpaces/Executable/CMakeLists.txt
index d679168..77e6751 100644
--- a/Tests/SubDirSpaces/Executable/CMakeLists.txt
+++ b/Tests/SubDirSpaces/Executable/CMakeLists.txt
@@ -1 +1 @@
-ADD_EXECUTABLE(test test.cxx)
+add_executable(test test.cxx)
diff --git a/Tests/SubDirSpaces/Some Examples/CMakeLists.txt b/Tests/SubDirSpaces/Some Examples/CMakeLists.txt
index b0f1e89..8cd7e24 100644
--- a/Tests/SubDirSpaces/Some Examples/CMakeLists.txt
+++ b/Tests/SubDirSpaces/Some 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/SubDirSpaces/Some Examples/example1/CMakeLists.txt b/Tests/SubDirSpaces/Some Examples/example1/CMakeLists.txt
index 3036183..20d065e 100644
--- a/Tests/SubDirSpaces/Some Examples/example1/CMakeLists.txt
+++ b/Tests/SubDirSpaces/Some 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/SubDirSpaces/Some Examples/example2/CMakeLists.txt b/Tests/SubDirSpaces/Some Examples/example2/CMakeLists.txt
index 19a5376..388e33c 100644
--- a/Tests/SubDirSpaces/Some Examples/example2/CMakeLists.txt
+++ b/Tests/SubDirSpaces/Some Examples/example2/CMakeLists.txt
@@ -1,2 +1,2 @@
-PROJECT(example2)
-ADD_EXECUTABLE(example2 example2.cxx)
+project(example2)
+add_executable(example2 example2.cxx)