diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 19:01:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 19:01:38 (GMT) |
| commit | 2031b6a9f309b6c8f7da0abe2d943ab9c0748758 (patch) | |
| tree | 82d5011ff29594433827c04b42deab665f596f81 /Tests | |
| parent | 12e7bdea50646556f953045139fc4cae5e400b82 (diff) | |
| parent | f578381e6624b83843a1b9ff079a8073f7bc210f (diff) | |
| download | CMake-2031b6a9f309b6c8f7da0abe2d943ab9c0748758.zip CMake-2031b6a9f309b6c8f7da0abe2d943ab9c0748758.tar.gz CMake-2031b6a9f309b6c8f7da0abe2d943ab9c0748758.tar.bz2 | |
Merge topic 'vs2010_header_only_fix'
f578381 Fix vs2010 project generation error when HEADER_FILE_ONLY is set.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/Complex/Executable/complex_nobuild.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 98b29bb..08cc7d4 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/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/Complex/Executable/complex_nobuild.c b/Tests/Complex/Executable/complex_nobuild.c new file mode 100644 index 0000000..6b3c2c1 --- /dev/null +++ b/Tests/Complex/Executable/complex_nobuild.c @@ -0,0 +1 @@ +#error "This file should not be compiled." |