diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-29 13:07:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-29 13:07:28 (GMT) |
| commit | db4ba61f3974258ad972a1594ee7b0d5b6f7a68c (patch) | |
| tree | ca6758f2967aeefe016b0ccf4ca80b53b284c0c3 /Tests | |
| parent | b9b3ec4d98b03c180b2e6b9ad8edba7f75576353 (diff) | |
| parent | 943fe6e3b40cde7eb927bb2e2acf049fe580c188 (diff) | |
| download | CMake-db4ba61f3974258ad972a1594ee7b0d5b6f7a68c.zip CMake-db4ba61f3974258ad972a1594ee7b0d5b6f7a68c.tar.gz CMake-db4ba61f3974258ad972a1594ee7b0d5b6f7a68c.tar.bz2 | |
Merge topic 'revert-try_compile-config-flags'
943fe6e3 Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/try_compile/CompileFlags.cmake | 17 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/src.c | 3 |
3 files changed, 0 insertions, 21 deletions
diff --git a/Tests/RunCMake/try_compile/CompileFlags.cmake b/Tests/RunCMake/try_compile/CompileFlags.cmake deleted file mode 100644 index d4dc074..0000000 --- a/Tests/RunCMake/try_compile/CompileFlags.cmake +++ /dev/null @@ -1,17 +0,0 @@ -enable_language(C) -set(CMAKE_C_FLAGS_RELEASE "-DPP_ERROR ${CMAKE_C_FLAGS_DEBUG}") - -#----------------------------------------------------------------------------- -set(CMAKE_TRY_COMPILE_CONFIGURATION Release) -try_compile(RESULT ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src.c - OUTPUT_VARIABLE out - ) -string(REPLACE "\n" "\n " out " ${out}") -if(RESULT) - message(FATAL_ERROR "try_compile passed but should have failed:\n${out}") -elseif(NOT "x${out}" MATCHES "PP_ERROR is defined") - message(FATAL_ERROR "try_compile did not fail with PP_ERROR:\n${out}") -else() - message(STATUS "try_compile with per-config flag worked as expected") -endif() diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake index ec099fe..4f30f1d 100644 --- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake +++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake @@ -25,7 +25,6 @@ run_cmake(TargetTypeInvalid) run_cmake(TargetTypeStatic) run_cmake(CMP0056) -run_cmake(CompileFlags) if(RunCMake_GENERATOR MATCHES "Make|Ninja") # Use a single build tree for a few tests without cleaning. diff --git a/Tests/RunCMake/try_compile/src.c b/Tests/RunCMake/try_compile/src.c index 5e51382..8488f4e 100644 --- a/Tests/RunCMake/try_compile/src.c +++ b/Tests/RunCMake/try_compile/src.c @@ -2,6 +2,3 @@ int main(void) { return 0; } -#ifdef PP_ERROR -#error PP_ERROR is defined -#endif |