From 9547b761ae0d00995cd11235683a3c6b1320e827 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 22:43:22 +0200 Subject: [PATCH] [highfive] clang-cl fix flags (#26055) * highfive fix compiler flags for clang-cl * v db --- ports/highfive/fix_compiler_flags.patch | 14 ++++++++++++++ ports/highfive/portfile.cmake | 1 + ports/highfive/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/highfive.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/highfive/fix_compiler_flags.patch diff --git a/ports/highfive/fix_compiler_flags.patch b/ports/highfive/fix_compiler_flags.patch new file mode 100644 index 0000000000..06a766c6e4 --- /dev/null +++ b/ports/highfive/fix_compiler_flags.patch @@ -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() diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index f43ab26b58..50f6f3fd8b 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependency-hdf5.patch fix-error-C1128.patch + fix_compiler_flags.patch ) vcpkg_check_features( diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json index c30c528606..47b8d9e1fb 100644 --- a/ports/highfive/vcpkg.json +++ b/ports/highfive/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index b95aadec8f..68aa435dcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2830,7 +2830,7 @@ }, "highfive": { "baseline": "2.3", - "port-version": 2 + "port-version": 3 }, "highway": { "baseline": "0.14.2", diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json index eaf02f1bab..ba429d3ee2 100644 --- a/versions/h-/highfive.json +++ b/versions/h-/highfive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8303489c627f763e4edfea72273d56ce30dcbc02", + "version": "2.3", + "port-version": 3 + }, { "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81", "version": "2.3",