зеркало из https://github.com/microsoft/vcpkg.git
[highfive] clang-cl fix flags (#26055)
* highfive fix compiler flags for clang-cl * v db
This commit is contained in:
Родитель
55209aae66
Коммит
9547b761ae
|
@ -0,0 +1,14 @@
|
|||
diff --git a/CMake/config/CompilerFlagsHelpers.cmake b/CMake/config/CompilerFlagsHelpers.cmake
|
||||
index 67e7d9fe1..11ae2036c 100644
|
||||
--- a/CMake/config/CompilerFlagsHelpers.cmake
|
||||
+++ b/CMake/config/CompilerFlagsHelpers.cmake
|
||||
@@ -32,6 +32,9 @@ foreach(COMPILER_LANGUAGE ${SUPPORTED_COMPILER_LANGUAGE_LIST})
|
||||
set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_MSVC ON)
|
||||
elseif(${CMAKE_${COMPILER_LANGUAGE}_COMPILER_ID} MATCHES "Clang")
|
||||
set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_CLANG ON)
|
||||
+ if(CMAKE_${COMPILER_LANGUAGE}_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")
|
||||
+ set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_MSVC ON)
|
||||
+ endif()
|
||||
elseif(CMAKE_${COMPILER_LANGUAGE}_COMPILER_ID MATCHES "GNU")
|
||||
set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_GCC ON)
|
||||
else()
|
|
@ -7,6 +7,7 @@ vcpkg_from_github(
|
|||
PATCHES
|
||||
fix-dependency-hdf5.patch
|
||||
fix-error-C1128.patch
|
||||
fix_compiler_flags.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "highfive",
|
||||
"version": "2.3",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5",
|
||||
"homepage": "https://github.com/BlueBrain/HighFive",
|
||||
"license": "BSL-1.0",
|
||||
|
|
|
@ -2830,7 +2830,7 @@
|
|||
},
|
||||
"highfive": {
|
||||
"baseline": "2.3",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"highway": {
|
||||
"baseline": "0.14.2",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8303489c627f763e4edfea72273d56ce30dcbc02",
|
||||
"version": "2.3",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81",
|
||||
"version": "2.3",
|
||||
|
|
Загрузка…
Ссылка в новой задаче