|
|
@@ -163,7 +163,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
|
|
|
include(Platform/Windows-MSVC)
|
|
|
# Set the clang option forwarding prefix for clang-cl usage in the llvm-rc processing stage
|
|
|
__enable_llvm_rc_preprocessing("-clang:")
|
|
|
- macro(__windows_compiler_clang lang)
|
|
|
+ macro(__windows_compiler_clang_base lang)
|
|
|
set(_COMPILE_${lang} "${_COMPILE_${lang}_MSVC}")
|
|
|
__windows_compiler_msvc(${lang})
|
|
|
endmacro()
|
|
|
@@ -179,7 +179,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
|
|
|
set(CMAKE_BUILD_TYPE_INIT Debug)
|
|
|
|
|
|
__enable_llvm_rc_preprocessing("")
|
|
|
- macro(__windows_compiler_clang lang)
|
|
|
+ macro(__windows_compiler_clang_base lang)
|
|
|
__windows_compiler_clang_gnu(${lang})
|
|
|
endmacro()
|
|
|
endif()
|
|
|
@@ -187,7 +187,16 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
|
|
|
else()
|
|
|
include(Platform/Windows-GNU)
|
|
|
__enable_llvm_rc_preprocessing("")
|
|
|
- macro(__windows_compiler_clang lang)
|
|
|
+ macro(__windows_compiler_clang_base lang)
|
|
|
__windows_compiler_gnu(${lang})
|
|
|
endmacro()
|
|
|
endif()
|
|
|
+
|
|
|
+macro(__windows_compiler_clang lang)
|
|
|
+ if(CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.4.0)
|
|
|
+ set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "-target ")
|
|
|
+ else()
|
|
|
+ set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "--target=")
|
|
|
+ endif()
|
|
|
+ __windows_compiler_clang_base(${lang})
|
|
|
+endmacro()
|