diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-04-09 16:02:48 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-04-09 16:02:48 (GMT) |
| commit | d6da8ce630f9a26922169d97fb9aed5206583f0a (patch) | |
| tree | 66e0710ad8870267aa0eb92ff3f980a0e1fb5feb /Tests/ComplexRelativePaths | |
| parent | b3cb8ae4bdd519e8d70692167089f96a433d4ef7 (diff) | |
| download | CMake-d6da8ce630f9a26922169d97fb9aed5206583f0a.zip CMake-d6da8ce630f9a26922169d97fb9aed5206583f0a.tar.gz CMake-d6da8ce630f9a26922169d97fb9aed5206583f0a.tar.bz2 | |
ENH: check for compile flags and add back c flag to unix generator
Diffstat (limited to 'Tests/ComplexRelativePaths')
4 files changed, 12 insertions, 2 deletions
diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 7468926..93d1abb 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -1,6 +1,7 @@ # # Create exe. # +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") SET_SOURCE_FILES_PROPERTIES(complex COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS") ADD_EXECUTABLE(complex complex) diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 6607d7d..adde525 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -132,7 +132,10 @@ int main() { cmPassed("Call to file2 function returned 1."); } - +#ifndef TEST_CXX_FLAGS + cmFailed("CMake CMAKE_CXX_FLAGS is not being passed to the compiler!"); +#else + cmPassed("CMake CMAKE_CXX_FLAGS is being passed to the compiler."); // ---------------------------------------------------------------------- // Test ADD_DEFINITIONS diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt index 19cb6cd..b3c402c 100644 --- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt @@ -25,7 +25,7 @@ ADD_LIBRARY(CMakeTestLibrary LibrarySources) # SOURCE_FILES(SharedLibrarySources sharedFile) ADD_LIBRARY(CMakeTestLibraryShared SHARED SharedLibrarySources) - +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS") ADD_LIBRARY(CMakeTestCLibraryShared SHARED testConly.c) # diff --git a/Tests/ComplexRelativePaths/Library/testConly.c b/Tests/ComplexRelativePaths/Library/testConly.c index 05ec107..35d6a39 100644 --- a/Tests/ComplexRelativePaths/Library/testConly.c +++ b/Tests/ComplexRelativePaths/Library/testConly.c @@ -2,5 +2,11 @@ int CsharedFunction() { +#ifndef TEST_C_FLAGS + printf("TEST_C_FLAGS failed\n"); + return 0; +#else + printf("Passed: TEST_C_FLAGS passed\n"); +#endif return 1; } |