summaryrefslogtreecommitdiffstats
path: root/config/toolchain
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-09-24 20:02:33 (GMT)
committerGitHub <noreply@github.com>2021-09-24 20:02:33 (GMT)
commit108c7397372751efe5f953c854673cbcfc7356ca (patch)
treeb826ec01ec8dba1e2889021675d11631d8c84b4d /config/toolchain
parent9e93204a23346a5b7cf5b8673cf50e6ac2497021 (diff)
downloadhdf5-108c7397372751efe5f953c854673cbcfc7356ca.zip
hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.gz
hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.bz2
1.8 Merge config changes from dev (#1032)
* Merge config changes from dev * Revert added git file changes * Merge MS clang needs EHsc flag #1035
Diffstat (limited to 'config/toolchain')
-rw-r--r--config/toolchain/clang.cmake9
1 files changed, 7 insertions, 2 deletions
diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
index 5e3b13a..af176aa 100644
--- a/config/toolchain/clang.cmake
+++ b/config/toolchain/clang.cmake
@@ -3,8 +3,13 @@
set(CMAKE_COMPILER_VENDOR "clang")
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
+if(WIN32)
+ set(CMAKE_C_COMPILER clang-cl)
+ set(CMAKE_CXX_COMPILER clang-cl)
+else()
+ set(CMAKE_C_COMPILER clang)
+ set(CMAKE_CXX_COMPILER clang++)
+endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# the following is used if cross-compiling