diff options
| author | Ken Martin <ken.martin@kitware.com> | 2002-04-22 11:51:26 -0400 |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2002-04-22 11:51:26 -0400 |
| commit | 7aa35093b8f96ef75bbf9160a55739be4861b9ea (patch) | |
| tree | 224dacac83a61d4d08ec7a78301f636d38440655 /Tests/ComplexOneConfig/Executable | |
| parent | 9c69be42deb1aba6c37eaad2d5b2c07bae58a13a (diff) | |
| download | cmake-7aa35093b8f96ef75bbf9160a55739be4861b9ea.tar.gz | |
fixed for remove COMMAND
Diffstat (limited to 'Tests/ComplexOneConfig/Executable')
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/cmVersion.h.in | 1 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 13 |
3 files changed, 22 insertions, 3 deletions
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 1533f3e595..165e7cde9a 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -1,9 +1,10 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 1.3) # # Create exe. # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") -SET_SOURCE_FILES_PROPERTIES(complex - COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS") +SET_SOURCE_FILES_PROPERTIES(complex COMPILE_FLAGS + "-DFILE_HAS_EXTRA_COMPILE_FLAGS") ADD_EXECUTABLE(complex complex) SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) @@ -19,7 +20,7 @@ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) TARGET_LINK_LIBRARIES(complex CMakeLib debug CMakeLib - optimized CMakeLib) + optimized CgMakeLib) # # Output the files required by 'complex' to a file. @@ -36,4 +37,8 @@ SUBDIRS(Temp) INSTALL_TARGETS(/tmp complex) INSTALL_PROGRAMS(/tmp complex) +CONFIGURE_FILE( + ${Complex_SOURCE_DIR}/Executable/cmVersion.h.in + ${Complex_BINARY_DIR}/cmVersion.h) + SOURCE_GROUP(A_GROUP ".cxx") diff --git a/Tests/ComplexOneConfig/Executable/cmVersion.h.in b/Tests/ComplexOneConfig/Executable/cmVersion.h.in new file mode 100644 index 0000000000..de7522d1db --- /dev/null +++ b/Tests/ComplexOneConfig/Executable/cmVersion.h.in @@ -0,0 +1 @@ +#define CMAKE_MINIMUM_REQUIRED_VERSION "${CMAKE_MINIMUM_REQUIRED_VERSION}" diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 7d86179dd3..89c3436b64 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -1,4 +1,5 @@ #include "cmTestConfigure.h" +#include "cmVersion.h" #include "ExtraSources/file1.h" #include "file2.h" #include "sharedFile.h" @@ -655,6 +656,18 @@ int main() { cmFailed("CMAKE_MINIMUM_REQUIRED_VERSION is not set to the expected 1.3"); } + + // ---------------------------------------------------------------------- + // Test REMOVE command + if (strcmp("a;b;d",REMOVE_STRING)) + { + cmPassed("REMOVE is working"); + } + else + { + cmFailed("REMOVE is not working"); + } + // ---------------------------------------------------------------------- // Summary |