diff options
author | Sebastien Barre <sebastien.barre@kitware.com> | 2002-03-29 20:02:18 (GMT) |
---|---|---|
committer | Sebastien Barre <sebastien.barre@kitware.com> | 2002-03-29 20:02:18 (GMT) |
commit | b3647fe6d3b014dc41c9b1fb735f7a70a3e003d0 (patch) | |
tree | 5624be60404ece6954b2d6c5c3d5297a92fdd9eb /Tests/Complex/Library | |
parent | 2d5ddb07fd4c423303771a31326fd218bad99645 (diff) | |
download | CMake-b3647fe6d3b014dc41c9b1fb735f7a70a3e003d0.zip CMake-b3647fe6d3b014dc41c9b1fb735f7a70a3e003d0.tar.gz CMake-b3647fe6d3b014dc41c9b1fb735f7a70a3e003d0.tar.bz2 |
ENH: fix tests
Diffstat (limited to 'Tests/Complex/Library')
-rw-r--r-- | Tests/Complex/Library/CMakeLists.txt | 23 | ||||
-rw-r--r-- | Tests/Complex/Library/cmTestLibraryConfigure.h.in | 4 | ||||
-rw-r--r-- | Tests/Complex/Library/dummy | 0 | ||||
-rw-r--r-- | Tests/Complex/Library/empty.h | 1 | ||||
-rw-r--r-- | Tests/Complex/Library/file2.cxx | 17 | ||||
-rw-r--r-- | Tests/Complex/Library/file2.h | 1 | ||||
-rw-r--r-- | Tests/Complex/Library/fileFlags.cxx | 4 |
7 files changed, 1 insertions, 49 deletions
diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt index 5533d04..c01f501 100644 --- a/Tests/Complex/Library/CMakeLists.txt +++ b/Tests/Complex/Library/CMakeLists.txt @@ -23,27 +23,7 @@ ADD_LIBRARY(CMakeTestLibrary LibrarySources) # # Create shared library # - -# test SET_SOURCE_FILES_PROPERTIES -SET_SOURCE_FILES_PROPERTIES(nonexisting_file2 GENERATED ABSTRACT WRAP_EXCLUDE COMPILE_FLAGS "-foo -bar") -GET_SOURCE_FILE_PROPERTY(ISABS nonexisting_file2 ABSTRACT) -GET_SOURCE_FILE_PROPERTY(WRAPEX nonexisting_file2 WRAP_EXCLUDE) -GET_SOURCE_FILE_PROPERTY(FLAGS nonexisting_file2 COMPILE_FLAGS) -MESSAGE("ISABS = ${ISABS} WRAPEX = ${WRAPEX} FLAGS = ${FLAGS}") - -CONFIGURE_FILE( - ${Complex_SOURCE_DIR}/Library/cmTestLibraryConfigure.h.in - ${Complex_BINARY_DIR}/Library/cmTestLibraryConfigure.h) - - - - -SOURCE_FILES(SharedLibrarySources nonexisting_file2) -SOURCE_FILES_REMOVE(SharedLibrarySources GENERATED nonexisting_file2) - - -SET_SOURCE_FILES_PROPERTIES(fileFlags COMPILE_FLAGS "-DEXTRA_FLAG" ) -SOURCE_FILES(SharedLibrarySources sharedFile fileFlags) +SOURCE_FILES(SharedLibrarySources sharedFile) ADD_LIBRARY(CMakeTestLibraryShared SHARED SharedLibrarySources) # @@ -60,7 +40,6 @@ ADD_CUSTOM_COMMAND(SOURCE CMakeTestLibraryShared # # Add a custom target. -# It runs ${CREATE_FILE_EXE} which will create the file # It runs ${CREATE_FILE_EXE} which will create a file. # The 'complex' executable will then test if this file exists and remove it. # diff --git a/Tests/Complex/Library/cmTestLibraryConfigure.h.in b/Tests/Complex/Library/cmTestLibraryConfigure.h.in deleted file mode 100644 index b5c1c41..0000000 --- a/Tests/Complex/Library/cmTestLibraryConfigure.h.in +++ /dev/null @@ -1,4 +0,0 @@ -#cmakedefine ISABS -#cmakedefine WRAPEX -#define FLAGS "${FLAGS}" - diff --git a/Tests/Complex/Library/dummy b/Tests/Complex/Library/dummy new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/Complex/Library/dummy diff --git a/Tests/Complex/Library/empty.h b/Tests/Complex/Library/empty.h index dea4b80..e69de29 100644 --- a/Tests/Complex/Library/empty.h +++ b/Tests/Complex/Library/empty.h @@ -1 +0,0 @@ -int file2(); diff --git a/Tests/Complex/Library/file2.cxx b/Tests/Complex/Library/file2.cxx index 29bc9d8..b52e547 100644 --- a/Tests/Complex/Library/file2.cxx +++ b/Tests/Complex/Library/file2.cxx @@ -1,23 +1,6 @@ -#include <Library/cmTestLibraryConfigure.h> #include <string.h> int file2() { return 1; } - -int PropertyTest() -{ - int ret = 1; -#ifndef ISABS - ret = 0; -#endif -#ifndef WRAPEX - ret = 0; -#endif - if(strcmp(FLAGS,"-foo -bar") != 0) - { - ret =0; - } - return ret; -} diff --git a/Tests/Complex/Library/file2.h b/Tests/Complex/Library/file2.h index 5e0b315..dea4b80 100644 --- a/Tests/Complex/Library/file2.h +++ b/Tests/Complex/Library/file2.h @@ -1,2 +1 @@ int file2(); -int PropertyTest(); diff --git a/Tests/Complex/Library/fileFlags.cxx b/Tests/Complex/Library/fileFlags.cxx deleted file mode 100644 index c766daa..0000000 --- a/Tests/Complex/Library/fileFlags.cxx +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef EXTRA_FLAG -syntax error EXTRA_FLAG should be defined on the command line for this file -#endif -int ALLOK; |