diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-04 18:49:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-04 18:49:23 (GMT) |
| commit | 4d70299c66d9a6ab757cd9a06b52c58ee14b286f (patch) | |
| tree | 8b92d7a3c3979b27a6b8d7db27c5d108b56604c4 | |
| parent | 1883ef1cda51cfce243b986b1149569de1d0eab9 (diff) | |
| parent | acfb54bb2f07072fab4adaa365fd7bdcdf83468a (diff) | |
| download | CMake-4d70299c66d9a6ab757cd9a06b52c58ee14b286f.zip CMake-4d70299c66d9a6ab757cd9a06b52c58ee14b286f.tar.gz CMake-4d70299c66d9a6ab757cd9a06b52c58ee14b286f.tar.bz2 | |
Merge topic 'clang_win32_subsystem'
acfb54bb2f Clang: Support WIN32_EXECUTABLE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5648
| -rw-r--r-- | Help/release/dev/clang-win32-subsystem.rst | 4 | ||||
| -rw-r--r-- | Modules/Platform/Windows-Clang.cmake | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Help/release/dev/clang-win32-subsystem.rst b/Help/release/dev/clang-win32-subsystem.rst new file mode 100644 index 0000000..c970f53 --- /dev/null +++ b/Help/release/dev/clang-win32-subsystem.rst @@ -0,0 +1,4 @@ +clang-win32-subsystem +--------------------- + +* :prop_tgt:`WIN32_EXECUTABLE` now works on Windows with Clang. diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake index 51e9e81..dc41572 100644 --- a/Modules/Platform/Windows-Clang.cmake +++ b/Modules/Platform/Windows-Clang.cmake @@ -71,6 +71,9 @@ macro(__windows_compiler_clang_gnu lang) set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_${lang}_COMPILER> -fuse-ld=lld-link -nostartfiles -nostdlib <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Xlinker /implib:<TARGET_IMPLIB> -Xlinker /pdb:<TARGET_PDB> -Xlinker /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>") + set(CMAKE_CREATE_WIN32_EXE "-Xlinker /subsystem:windows") + set(CMAKE_CREATE_CONSOLE_EXE "-Xlinker /subsystem:console") + if(NOT "${lang}" STREQUAL "ASM") set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded -Xclang -flto-visibility-public-std -D_MT -Xclang --dependent-lib=libcmt) set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL -D_DLL -D_MT -Xclang --dependent-lib=msvcrt) |