[arch-commits] Commit in restbed/trunk (5 files)
Date: Monday, July 1, 2019 @ 18:50:07 Author: archange Revision: 487171 upgpkg: restbed 4.6+104+gf74f932-1 Update restbed to follow Jami requirements. Added: restbed/trunk/find-catch2.patch Modified: restbed/trunk/PKGBUILD Deleted: restbed/trunk/0001-build-Only-run-tests-if-catch2-is-installed.patch restbed/trunk/0002-build-make-static-shared-builds-optional.patch restbed/trunk/0003-build-allow-only-static-or-shared-crypto-lib.patch -+ 0001-build-Only-run-tests-if-catch2-is-installed.patch | 62 - 0002-build-make-static-shared-builds-optional.patch | 88 -- 0003-build-allow-only-static-or-shared-crypto-lib.patch | 25 --- PKGBUILD| 49 --- find-catch2.patch | 16 ++ 5 files changed, 45 insertions(+), 195 deletions(-) Deleted: 0001-build-Only-run-tests-if-catch2-is-installed.patch === --- 0001-build-Only-run-tests-if-catch2-is-installed.patch 2019-07-01 18:31:16 UTC (rev 487170) +++ 0001-build-Only-run-tests-if-catch2-is-installed.patch 2019-07-01 18:50:07 UTC (rev 487171) @@ -1,62 +0,0 @@ -From 5c8fc4e9a6afe0e0b5bcfa4f3e7dbb4bfe167ba1 Mon Sep 17 00:00:00 2001 -From: Baptiste Jonglez -Date: Thu, 3 Jan 2019 00:47:39 +0100 -Subject: [PATCH] build: Only run tests if catch2 is installed - - CMakeLists.txt| 14 -- - cmake/Findcatch.cmake | 11 +++ - 2 files changed, 11 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c618244..95889e1 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,14 @@ endif ( ) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake" ) - - find_package( asio REQUIRED ) --find_package( catch REQUIRED ) -+find_package( catch ) -+if ( CATCH_FOUND ) -+enable_testing( ) -+add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" ) -+add_subdirectory( "${PROJECT_SOURCE_DIR}/test/feature" ) -+add_subdirectory( "${PROJECT_SOURCE_DIR}/test/regression" ) -+add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" ) -+endif ( ) - if ( BUILD_SSL ) - find_package( openssl REQUIRED ) - endif ( ) -@@ -77,11 +84,6 @@ else ( ) - target_link_libraries( ${SHARED_LIBRARY_NAME} ) - endif ( ) - --enable_testing( ) --add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" ) --add_subdirectory( "${PROJECT_SOURCE_DIR}/test/feature" ) --add_subdirectory( "${PROJECT_SOURCE_DIR}/test/regression" ) --add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" ) - - # - # Install -diff --git a/cmake/Findcatch.cmake b/cmake/Findcatch.cmake -index d070243..6c5be19 100644 a/cmake/Findcatch.cmake -+++ b/cmake/Findcatch.cmake -@@ -1,9 +1,4 @@ --find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/single_include" "/usr/include/catch2/single_include" "/usr/local/include/catch2/single_include" "/opt/local/include/catch2/single_include" ) -+find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/single_include" "/usr/include/catch2" "/usr/local/include/catch2/single_include" "/opt/local/include/catch2/single_include" ) - --if ( catch_INCLUDE ) --set( CATCH_FOUND TRUE ) -- --message( STATUS "Found Catch include at: ${catch_INCLUDE}" ) --else ( ) --message( FATAL_ERROR "Failed to locate Catch dependency." ) --endif ( ) -+include(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(catch DEFAULT_MSG catch_INCLUDE) --- -2.20.0 - Deleted: 0002-build-make-static-shared-builds-optional.patch === --- 0002-build-make-static-shared-builds-optional.patch 2019-07-01 18:31:16 UTC (rev 487170) +++ 0002-build-make-static-shared-builds-optional.patch 2019-07-01 18:50:07 UTC (rev 487171) @@ -1,88 +0,0 @@ -From 23fc2778b9ce6288cdcb33ae6b40926dc7dd69bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adrien=20B=C3=A9raud?= -Date: Mon, 1 Oct 2018 16:36:08 -0400 -Subject: [PATCH] build: make static, shared builds optional - - CMakeLists.txt | 52 ++ - 1 file changed, 31 insertions(+), 21 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2b27743..5e99964 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ message( "Copyright 2013-2018, Corvusoft Ltd, All Rights Reserved." ) - # Build Options - # - option( BUILD_SSL "Build secure socket layer support." ON ) -+option( BUILD_STATIC "Build static library." ON ) -+option( BUILD_SHARED "Build shared library." OFF ) - - # - # Configuration -@@ -61,27 +63,31 @@ include_directories( ${INCLUDE_DIR} SYSTEM ${asio_INCLUDE} ${kashmir_INCLUDE} ${ - # - file( GLOB_RECURSE MANIFEST "${SOURCE_DIR}/*.cpp" ) - --set( STATIC_LIBRARY_NAME "${PROJECT_NAME}-static" ) --add_libra
[arch-commits] Commit in restbed/trunk (5 files)
Date: Saturday, February 2, 2019 @ 15:35:31 Author: zorun Revision: 429177 restbed: update to 4.6+89+ga1e9c97 This update drops the dependency on kashmir, and requires some CMake hacks to build the tests. A single test is failing (out of 113 tests), fixing this is future work. Added: restbed/trunk/0001-build-Only-run-tests-if-catch2-is-installed.patch restbed/trunk/0002-build-make-static-shared-builds-optional.patch restbed/trunk/0003-build-allow-only-static-or-shared-crypto-lib.patch Modified: restbed/trunk/PKGBUILD Deleted: restbed/trunk/0001-cmake-Auto-detect-Catch-dependency-to-decide-whether.patch -+ 0001-build-Only-run-tests-if-catch2-is-installed.patch | 62 +++ 0001-cmake-Auto-detect-Catch-dependency-to-decide-whether.patch | 64 --- 0002-build-make-static-shared-builds-optional.patch | 88 ++ 0003-build-allow-only-static-or-shared-crypto-lib.patch | 25 ++ PKGBUILD| 28 ++- 5 files changed, 195 insertions(+), 72 deletions(-) Added: 0001-build-Only-run-tests-if-catch2-is-installed.patch === --- 0001-build-Only-run-tests-if-catch2-is-installed.patch (rev 0) +++ 0001-build-Only-run-tests-if-catch2-is-installed.patch 2019-02-02 15:35:31 UTC (rev 429177) @@ -0,0 +1,62 @@ +From 5c8fc4e9a6afe0e0b5bcfa4f3e7dbb4bfe167ba1 Mon Sep 17 00:00:00 2001 +From: Baptiste Jonglez +Date: Thu, 3 Jan 2019 00:47:39 +0100 +Subject: [PATCH] build: Only run tests if catch2 is installed + +--- + CMakeLists.txt| 14 -- + cmake/Findcatch.cmake | 11 +++ + 2 files changed, 11 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c618244..95889e1 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -42,7 +42,14 @@ endif ( ) + set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake" ) + + find_package( asio REQUIRED ) +-find_package( catch REQUIRED ) ++find_package( catch ) ++if ( CATCH_FOUND ) ++enable_testing( ) ++add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" ) ++add_subdirectory( "${PROJECT_SOURCE_DIR}/test/feature" ) ++add_subdirectory( "${PROJECT_SOURCE_DIR}/test/regression" ) ++add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" ) ++endif ( ) + if ( BUILD_SSL ) + find_package( openssl REQUIRED ) + endif ( ) +@@ -77,11 +84,6 @@ else ( ) + target_link_libraries( ${SHARED_LIBRARY_NAME} ) + endif ( ) + +-enable_testing( ) +-add_subdirectory( "${PROJECT_SOURCE_DIR}/test/unit" ) +-add_subdirectory( "${PROJECT_SOURCE_DIR}/test/feature" ) +-add_subdirectory( "${PROJECT_SOURCE_DIR}/test/regression" ) +-add_subdirectory( "${PROJECT_SOURCE_DIR}/test/integration" ) + + # + # Install +diff --git a/cmake/Findcatch.cmake b/cmake/Findcatch.cmake +index d070243..6c5be19 100644 +--- a/cmake/Findcatch.cmake b/cmake/Findcatch.cmake +@@ -1,9 +1,4 @@ +-find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/single_include" "/usr/include/catch2/single_include" "/usr/local/include/catch2/single_include" "/opt/local/include/catch2/single_include" ) ++find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/single_include" "/usr/include/catch2" "/usr/local/include/catch2/single_include" "/opt/local/include/catch2/single_include" ) + +-if ( catch_INCLUDE ) +-set( CATCH_FOUND TRUE ) +- +-message( STATUS "Found Catch include at: ${catch_INCLUDE}" ) +-else ( ) +-message( FATAL_ERROR "Failed to locate Catch dependency." ) +-endif ( ) ++include(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(catch DEFAULT_MSG catch_INCLUDE) +-- +2.20.0 + Deleted: 0001-cmake-Auto-detect-Catch-dependency-to-decide-whether.patch === --- 0001-cmake-Auto-detect-Catch-dependency-to-decide-whether.patch 2019-02-02 14:56:12 UTC (rev 429176) +++ 0001-cmake-Auto-detect-Catch-dependency-to-decide-whether.patch 2019-02-02 15:35:31 UTC (rev 429177) @@ -1,64 +0,0 @@ -From 78a25164be8a15bf3d677ac0f1de402e1377 Mon Sep 17 00:00:00 2001 -From: Baptiste Jonglez -Date: Mon, 2 Apr 2018 12:40:34 +0200 -Subject: [PATCH] cmake: Auto-detect Catch dependency to decide whether to - enable tests - -This automatically enables or disables tests, depending on whether Catch -is found on the system. - -Of course, it is still possible to force building tests: - -* `-DBUILD_TESTS=OFF` will disable tests even if Catch is found -* `-DBUILD_TESTS=ON` will enable tests even if Catch is not found (mostly useful because it causes cmake to fail early) - CMakeLists.txt| 8 +++- - cmake/modules/Findcatch.cmake | 9 ++--- - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/C