diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-01 19:51:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-01 19:51:36 (GMT) |
| commit | a4e02578406c79c1ef0c43b72a1efabcb747d47b (patch) | |
| tree | aa41a168e1a77f69b61f1a55d42efc5f481f99c8 /Tests | |
| parent | 0a11d3306632a1368960c18cee9d9605ac78cc25 (diff) | |
| parent | 8de3b3d13ed40e97b74eeac4ce2d966a73c5168a (diff) | |
| download | CMake-a4e02578406c79c1ef0c43b72a1efabcb747d47b.zip CMake-a4e02578406c79c1ef0c43b72a1efabcb747d47b.tar.gz CMake-a4e02578406c79c1ef0c43b72a1efabcb747d47b.tar.bz2 | |
Merge topic 'check_cxx_compiler_flag_cmakeonly'
8de3b3d CheckCXXCompilerFlag test: make it a CMakeOnly test
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeOnly/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt (renamed from Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt) | 16 |
3 files changed, 2 insertions, 18 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index badc76b..2c5acd9 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -241,8 +241,6 @@ IF(BUILD_TESTING) ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader) - ADD_TEST_MACRO(Module.CheckCXXCompilerFlag CheckCXXCompilerFlag) - ADD_TEST(LinkFlags-prepare ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt index 96b9972..33c426a 100644 --- a/Tests/CMakeOnly/CMakeLists.txt +++ b/Tests/CMakeOnly/CMakeLists.txt @@ -15,6 +15,8 @@ add_CMakeOnly_test(CheckSymbolExists) add_CMakeOnly_test(CheckCXXSymbolExists) +add_CMakeOnly_test(CheckCXXCompilerFlag) + add_CMakeOnly_test(AllFindModules) add_CMakeOnly_test(TargetScope) diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt index 77f5006..e205330 100644 --- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt +++ b/Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt @@ -56,19 +56,3 @@ if(CMAKE_COMPILER_IS_GNUCXX) else() message("Unhandled Platform") endif() - -# -# This is a no-op executable... If this test is going to fail, it fails during -# the configure step while cmake is configuring this CMakeLists.txt file... -# - -file(WRITE - "${CMAKE_CURRENT_BINARY_DIR}/main.cxx" - "int main() { return 0; } -" -) - -add_executable( - CheckCXXCompilerFlag - "${CMAKE_CURRENT_BINARY_DIR}/main.cxx" -) |