diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-19 15:32:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-22 12:48:44 (GMT) |
| commit | 61f70e81a708db126ba5e2d1135ff0e2a5ffba25 (patch) | |
| tree | a740b4f4b8e7788b124a2c0a6a63048016dfee75 /Tests/RunCMake/VS10Project | |
| parent | 8542152626590db6a13b20aa3d36214186c6b40d (diff) | |
| download | CMake-61f70e81a708db126ba5e2d1135ff0e2a5ffba25.zip CMake-61f70e81a708db126ba5e2d1135ff0e2a5ffba25.tar.gz CMake-61f70e81a708db126ba5e2d1135ff0e2a5ffba25.tar.bz2 | |
MSVC: Document and test behavior of empty MSVC_RUNTIME_LIBRARY
Extend tests added by commit fb3370b6a1 (MSVC: Add abstraction for
runtime library selection, 2019-04-10) to cover an empty value for
the property. It should result in no specific setting.
Issue: #19108
Diffstat (limited to 'Tests/RunCMake/VS10Project')
| -rw-r--r-- | Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/VS10Project/RuntimeLibrary.cmake | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake b/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake index 6b43d47..689b35f 100644 --- a/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake +++ b/Tests/RunCMake/VS10Project/RuntimeLibrary-check.cmake @@ -20,7 +20,7 @@ macro(RuntimeLibrary_check tgt rtl_expect) endif() endforeach() - if(NOT HAVE_Runtimelibrary) + if(NOT HAVE_Runtimelibrary AND NOT "${rtl_expect}" STREQUAL "") set(RunCMake_TEST_FAILED "Project file ${tgt}.vcxproj does not have a RuntimeLibrary field.") return() endif() @@ -28,6 +28,8 @@ endmacro() RuntimeLibrary_check(default-C MultiThreadedDebugDLL) RuntimeLibrary_check(default-CXX MultiThreadedDebugDLL) +RuntimeLibrary_check(empty-C "") +RuntimeLibrary_check(empty-CXX "") RuntimeLibrary_check(MTd-C MultiThreadedDebug) RuntimeLibrary_check(MTd-CXX MultiThreadedDebug) RuntimeLibrary_check(MT-C MultiThreaded) diff --git a/Tests/RunCMake/VS10Project/RuntimeLibrary.cmake b/Tests/RunCMake/VS10Project/RuntimeLibrary.cmake index 6c77a25..d7787c8 100644 --- a/Tests/RunCMake/VS10Project/RuntimeLibrary.cmake +++ b/Tests/RunCMake/VS10Project/RuntimeLibrary.cmake @@ -6,6 +6,10 @@ enable_language(CXX) add_library(default-C empty.c) add_library(default-CXX empty.cxx) +set(CMAKE_MSVC_RUNTIME_LIBRARY "") +add_library(empty-C empty.c) +add_library(empty-CXX empty.cxx) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebug") add_library(MTd-C empty.c) add_library(MTd-CXX empty.cxx) |