From 2cad8aef5eea9c7fea39a5ae9d4af458c7019b7d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 22 Oct 2023 07:19:03 +0000 Subject: [PATCH] catch2, bump version (#9664) --- ...atch2-3.3.1.recipe => catch2-3.4.0.recipe} | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) rename dev-cpp/catch2/{catch2-3.3.1.recipe => catch2-3.4.0.recipe} (67%) diff --git a/dev-cpp/catch2/catch2-3.3.1.recipe b/dev-cpp/catch2/catch2-3.4.0.recipe similarity index 67% rename from dev-cpp/catch2/catch2-3.3.1.recipe rename to dev-cpp/catch2/catch2-3.4.0.recipe index dfa7a5735..4bdd648f3 100644 --- a/dev-cpp/catch2/catch2-3.3.1.recipe +++ b/dev-cpp/catch2/catch2-3.4.0.recipe @@ -11,7 +11,7 @@ COPYRIGHT="Catch2 Authors" LICENSE="Boost v1.0" REVISION="1" SOURCE_URI="$HOMEPAGE/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace" +CHECKSUM_SHA256="122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb" SOURCE_FILENAME="catch2-v$portVersion.tar.gz" SOURCE_DIR="Catch2-$portVersion" @@ -20,13 +20,22 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" catch2$secondaryArchSuffix = $portVersion - devel:libcatch2$secondaryArchSuffix = $portVersion - devel:libcatch2main$secondaryArchSuffix = $portVersion + lib:libcatch2$secondaryArchSuffix = $portVersion + lib:libcatch2main$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix " +PROVIDES_devel=" + catch2${secondaryArchSuffix}_devel = $portVersion + devel:libcatch2$secondaryArchSuffix = $portVersion + devel:libcatch2main$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + catch2$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -40,8 +49,10 @@ BUILD_PREREQUIRES=" BUILD() { cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ - $cmakeDirArgs #\ - #-DCATCH_DEVELOPMENT_BUILD=ON #needed to run the tests + $cmakeDirArgs \ + -DBUILD_SHARED_LIBS=ON \ + -DPKGCONFIG_INSTALL_DIR=$developLibDir/pkgconfig # \ + # -DCATCH_DEVELOPMENT_BUILD=ON #needed to run the tests make -C build $jobArgs } @@ -49,7 +60,13 @@ INSTALL() { make -C build install - prepareInstalledDevelLibs libCatch2 libCatch2Main + prepareInstalledDevelLibs libCatch2 \ + libCatch2Main + + packageEntries devel \ + $developDir \ + $documentationDir \ + $libDir/cmake } TEST()