diff options
| author | Brad King <brad.king@kitware.com> | 2011-12-23 14:18:18 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-12-23 16:16:47 -0500 |
| commit | 63379207e189688d7e266e6b27420300c9761caf (patch) | |
| tree | aecbf68f0610d71395c5e4d1241faa7282596939 /Tests/ComplexOneConfig | |
| parent | 6a7582124cb19a5c869263e9bec716be76c7640a (diff) | |
| download | cmake-63379207e189688d7e266e6b27420300c9761caf.tar.gz | |
complex: Sync Tests/ComplexOneConfig with Tests/Complex
The two test sources must remain identical. Apply to ComplexOneConfig
the change that commit f578381e (Fix vs2010 project generation error
when HEADER_FILE_ONLY is set, 2010-12-20) made to Complex.
Diffstat (limited to 'Tests/ComplexOneConfig')
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex_nobuild.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 98b29bbf2c..08cc7d45b0 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -49,10 +49,17 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) SET_SOURCE_FILES_PROPERTIES(complex_nobuild.cxx PROPERTIES HEADER_FILE_ONLY 1) +# Test forcing a .c file to not build. +# This makes sure a mixed language library is created +# with header file only sources +SET_SOURCE_FILES_PROPERTIES(complex_nobuild.c PROPERTIES + HEADER_FILE_ONLY 1) + ADD_EXECUTABLE(A A.cxx A.hh A.h A.txt) ADD_EXECUTABLE(complex complex testcflags.c ) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c) -ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx) +ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx + complex_nobuild.c) IF(COMPLEX_TEST_CMAKELIB) TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmlibarchive cmbzip2 cmcurl) ENDIF(COMPLEX_TEST_CMAKELIB) diff --git a/Tests/ComplexOneConfig/Executable/complex_nobuild.c b/Tests/ComplexOneConfig/Executable/complex_nobuild.c new file mode 100644 index 0000000000..6b3c2c1e2d --- /dev/null +++ b/Tests/ComplexOneConfig/Executable/complex_nobuild.c @@ -0,0 +1 @@ +#error "This file should not be compiled." |