diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-03 16:51:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-03 16:51:34 (GMT) |
| commit | b81aef19de9c1986cc4c0a92faa108f20c70f1db (patch) | |
| tree | 5c13c80cd2b696bd31e2b9baa89628bc2ddcfa78 /Tests | |
| parent | a19bc6ae39ecaffe55a44a47d05c7189706aec1d (diff) | |
| parent | 97de48b52899007e3ecfb988bddff8a8d9b70110 (diff) | |
| download | CMake-b81aef19de9c1986cc4c0a92faa108f20c70f1db.zip CMake-b81aef19de9c1986cc4c0a92faa108f20c70f1db.tar.gz CMake-b81aef19de9c1986cc4c0a92faa108f20c70f1db.tar.bz2 | |
Merge topic 'windows-gnu-asm'
97de48b528 Tests: Update Assembler code generation to select MSVC runtime library
6348ffb9e5 ASM: Hook up Windows-specific GNU/Clang compiler information modules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4287
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Assembler/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt index 21b265c..a3c9946 100644 --- a/Tests/Assembler/CMakeLists.txt +++ b/Tests/Assembler/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required (VERSION 3.8) project(Assembler C) message("CTEST_FULL_OUTPUT ") set(CMAKE_VERBOSE_MAKEFILE 1) @@ -22,7 +22,11 @@ if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode|Ninja" AND set(SRCS main.s) add_custom_command( OUTPUT main.s - COMMAND ${CMAKE_C_COMPILER} ${C_FLAGS} -S ${CMAKE_CURRENT_SOURCE_DIR}/main.c -o main.s + COMMAND ${CMAKE_C_COMPILER} ${C_FLAGS} + "$<$<CONFIG:Debug>:${CMAKE_C_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL}>" + "$<$<NOT:$<CONFIG:Debug>>:${CMAKE_C_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL}>" + -S ${CMAKE_CURRENT_SOURCE_DIR}/main.c -o main.s + COMMAND_EXPAND_LISTS DEPENDS main.c VERBATIM ) |