From dec95c6eae27fedd3aab8f47c303ee341a4388d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 23 Jul 2021 07:05:06 +0200 Subject: [openblas] Fix C/CXX flag customization in openblas (#18535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix C/CXX flag customization in openblas * Update ports/openblas/portfile.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Update versions * Update versions/o-/openblas.json * Fix merge conflict * Update versions/o-/openblas.json Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/openblas/portfile.cmake | 4 ++-- ports/openblas/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openblas.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index df74c3e68..262101692 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -79,8 +79,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS) ${COMMON_OPTIONS} ) else() - list(APPEND VCPKG_C_FLAGS "-DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ - list(APPEND VCPKG_CXX_FLAGS "-DNEEDBUNDERSCORE") + string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ + string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 657558ade..8315910a3 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openblas", "version": "0.3.10", - "port-version": 2, + "port-version": 3, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 591b749e1..c7e495c15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4546,7 +4546,7 @@ }, "openblas": { "baseline": "0.3.10", - "port-version": 2 + "port-version": 3 }, "opencascade": { "baseline": "7.5.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index fcc607ec4..5b2fde684 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d57360e6e7afa4e4f033a87e1ded91571ee462", + "version": "0.3.10", + "port-version": 3 + }, { "git-tree": "510adc011214327468768aa22c1f08a2d2d632ab", "version": "0.3.10", -- cgit v1.2.3