diff options
| author | Brad King <brad.king@kitware.com> | 2002-12-13 22:35:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2002-12-13 22:35:00 (GMT) |
| commit | 526649127e5e19076d7837d15095f47c64015fb5 (patch) | |
| tree | 743b7352790675cf9713db73f00ba1f1839e45dd /Tests/Complex | |
| parent | 4cbcd08594697a77aa7d619169706e62e01a07e2 (diff) | |
| download | CMake-526649127e5e19076d7837d15095f47c64015fb5.zip CMake-526649127e5e19076d7837d15095f47c64015fb5.tar.gz CMake-526649127e5e19076d7837d15095f47c64015fb5.tar.bz2 | |
ENH: Added test for generated header included by non-generated source.
Diffstat (limited to 'Tests/Complex')
| -rw-r--r-- | Tests/Complex/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | Tests/Complex/Executable/complex.cxx | 7 | ||||
| -rw-r--r-- | Tests/Complex/cmTestGeneratedHeader.h.in | 1 |
4 files changed, 25 insertions, 3 deletions
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index f42ac45..532f725 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -61,7 +61,7 @@ INCLUDE_DIRECTORIES(BEFORE ${Complex_BINARY_DIR} ) -INCLUDE_REGULAR_EXPRESSION("^(cmTest|file|sharedFile).*$" ".*") +INCLUDE_REGULAR_EXPRESSION("^(cmTest|file|sharedFile).*$" "^$") LINK_DIRECTORIES( ${Complex_BINARY_DIR}/Library diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 8d3c11d..2011feb 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -3,8 +3,7 @@ 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") + # Link to CMake lib LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to @@ -22,6 +21,21 @@ ELSE(UNIX) ENDIF(NOT BORLAND) ENDIF (UNIX) +SET_SOURCE_FILES_PROPERTIES(complex + COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS" + OBJECT_DEPENDS ${Complex_BINARY_DIR}/cmTestGeneratedHeader.h +) + +ADD_CUSTOM_COMMAND( + TARGET complex + SOURCE ${Complex_SOURCE_DIR}/cmTestGeneratedHeader.h.in + COMMAND ${CMAKE_COMMAND} + ARGS -E copy ${Complex_SOURCE_DIR}/cmTestGeneratedHeader.h.in + ${Complex_BINARY_DIR}/cmTestGeneratedHeader.h + OUTPUTS ${Complex_BINARY_DIR}/cmTestGeneratedHeader.h + DEPENDS ${CMAKE_COMMAND} +) + # # Output the files required by 'complex' to a file. # diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 7aa4140..d6d3839 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -1,5 +1,6 @@ #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" +#include "cmTestGeneratedHeader.h" #include "cmVersion.h" #include "ExtraSources/file1.h" #include "file2.h" @@ -808,6 +809,12 @@ int main() #else cmFailed("IF inside a FOREACH block is broken"); #endif + +#if defined(GENERATED_HEADER_INCLUDED) + cmPassed("Generated header included by non-generated source works."); +#else + cmFailed("Generated header included by non-generated source failed."); +#endif #ifdef FORCE_TEST cmFailed("CMake SET CACHE FORCE"); diff --git a/Tests/Complex/cmTestGeneratedHeader.h.in b/Tests/Complex/cmTestGeneratedHeader.h.in new file mode 100644 index 0000000..0e9dd3f --- /dev/null +++ b/Tests/Complex/cmTestGeneratedHeader.h.in @@ -0,0 +1 @@ +#define GENERATED_HEADER_INCLUDED |