diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-29 18:02:51 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-29 18:02:51 (GMT) |
| commit | 76e14b4f1a53e295613593a8c731d39db2617c1a (patch) | |
| tree | 53e4bf66d329afe17104e3bc335cef66979b6145 /Tests/ComplexOneConfig | |
| parent | db28904467764a496be7cde1c903368afc1f8da3 (diff) | |
| download | CMake-76e14b4f1a53e295613593a8c731d39db2617c1a.zip CMake-76e14b4f1a53e295613593a8c731d39db2617c1a.tar.gz CMake-76e14b4f1a53e295613593a8c731d39db2617c1a.tar.bz2 | |
ENH: do not test for c and cxx flags on visual studio as it does not work yet
Diffstat (limited to 'Tests/ComplexOneConfig')
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 28 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/cmTestConfigure.h.in | 1 |
2 files changed, 18 insertions, 11 deletions
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index a8356f1..1a35978 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -374,21 +374,27 @@ int main() #else cmPassed("CMake CMAKE_CXX_FLAGS is being passed to the compiler."); #endif + std::string gen = CMAKE_GENERATOR; + // visual studio is currently broken for c flags + if(gen.find("Visual") == gen.npos) + { #ifdef TEST_C_FLAGS - cmFailed("CMake CMAKE_C_FLAGS are being passed to c++ files the compiler!"); + cmFailed("CMake CMAKE_C_FLAGS are being passed to c++ files the compiler!"); #else - cmPassed("CMake CMAKE_C_FLAGS are not being passed to c++ files."); + cmPassed("CMake CMAKE_C_FLAGS are not being passed to c++ files."); #endif - char msg[1024]; - if(TestCFlags(msg)) - { - cmPassed( - "CMake CMAKE_C_FLAGS are being passed to c files and CXX flags are not."); - } - else - { - cmFailed(msg); + char msg[1024]; + if(TestCFlags(msg)) + { + cmPassed( + "CMake CMAKE_C_FLAGS are being passed to c files and CXX flags are not."); + } + else + { + cmFailed(msg); + } } + // ---------------------------------------------------------------------- // Test ADD_DEFINITIONS diff --git a/Tests/ComplexOneConfig/cmTestConfigure.h.in b/Tests/ComplexOneConfig/cmTestConfigure.h.in index 35c10b4..9dbdd0b 100644 --- a/Tests/ComplexOneConfig/cmTestConfigure.h.in +++ b/Tests/ComplexOneConfig/cmTestConfigure.h.in @@ -70,3 +70,4 @@ // Test SET CACHE FORCE #cmakedefine FORCE_TEST +#define CMAKE_GENERATOR "${CMAKE_GENERATOR}" |