diff options
Diffstat (limited to 'dev-cpp/ms-gsl')
-rw-r--r-- | dev-cpp/ms-gsl/Manifest | 1 | ||||
-rw-r--r-- | dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch | 82 | ||||
-rw-r--r-- | dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild | 34 |
3 files changed, 0 insertions, 117 deletions
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest index c1e82bb88d4d..cff79bbcb244 100644 --- a/dev-cpp/ms-gsl/Manifest +++ b/dev-cpp/ms-gsl/Manifest @@ -1,2 +1 @@ -DIST ms-gsl-3.1.0.tar.gz 78196 BLAKE2B 32334891a11004a6919645814154fdb108a4582a00ac0002c0af9a524978cc8316bebb07192e260b800f462d5424c476fc22be59cca59c0f3d9d7606ab8c4181 SHA512 2916df9ee165fc803ffae0a56518f2ba92870e279984913ff591559e1459943c3ffbc1f5a0d819ad8233f0c9034012de3616aa4e10557d87c7285d8425d10696 DIST ms-gsl-4.0.0.tar.gz 55846 BLAKE2B 4391f8865f8dc044e5a48826e84919df8e32fc80815a260e9c892aa6d155d278a9b7742c17e4455bcba3fc3164118c14ef160353913814ba48a83bc7de40c123 SHA512 7fa7446796c6bf82fb3bff09f86a69c446a27be528bef3b17c8bc5ad2f24d5cf86bdb3d3813ecb44726e8f395020180e97e41027330d1fbf545cc0f0b44aac29 diff --git a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch b/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch deleted file mode 100644 index fa8d09aafe74..000000000000 --- a/dev-cpp/ms-gsl/files/ms-gsl-3.0.0-use_system_gtest.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 727e9b8312c7ae011b667152606afc0e04ea197a Mon Sep 17 00:00:00 2001 -From: Jan Henke <Jan.Henke@taujhe.de> -Date: Sun, 14 Jun 2020 14:12:02 +0200 -Subject: [PATCH] Use system gtest instead of downloading and building it - ---- - CMakeLists.txt | 1 - - tests/CMakeLists.txt | 30 ++++-------------------------- - 2 files changed, 4 insertions(+), 27 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 740cd31..f1bf7a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.1.3...3.16) - project(GSL VERSION 3.1.0 LANGUAGES CXX) - - include(ExternalProject) --find_package(Git) - - # Use GNUInstallDirs to provide the right locations on all platforms - include(GNUInstallDirs) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 2bd1bbe..c42afb7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -5,32 +5,9 @@ project(GSLTests CXX) - # will make visual studio generated project group files - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - --configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) --execute_process( -- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . -- RESULT_VARIABLE result -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download --) --if(result) -- message(FATAL_ERROR "CMake step for googletest failed: ${result}") --endif() -- --execute_process( -- COMMAND ${CMAKE_COMMAND} --build . -- RESULT_VARIABLE result -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download --) --if(result) -- message(FATAL_ERROR "CMake step for googletest failed: ${result}") --endif() -- - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - --add_subdirectory( -- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src -- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build -- EXCLUDE_FROM_ALL --) -+find_package(GTest REQUIRED) - - if (MSVC AND (GSL_CXX_STANDARD EQUAL 17)) - set(GSL_CPLUSPLUS_OPT -Zc:__cplusplus -permissive-) -@@ -139,7 +116,7 @@ endif(MSVC) - - # for tests to find the gtest header - target_include_directories(gsl_tests_config SYSTEM INTERFACE -- googletest/googletest/include -+ ${GTest_INCLUDE_DIRS} - ) - - set_property(TARGET PROPERTY FOLDER "GSL_tests") -@@ -149,7 +126,8 @@ function(add_gsl_test name) - target_link_libraries(${name} - GSL - gsl_tests_config -- gtest_main -+ GTest::GTest -+ GTest::Main - ) - add_test( - ${name} --- -2.26.2 - diff --git a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild deleted file mode 100644 index f5c2d7ee0cec..000000000000 --- a/dev-cpp/ms-gsl/ms-gsl-3.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Guideline Support Library implementation by Microsoft" -HOMEPAGE="https://github.com/Microsoft/GSL" -SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/GSL-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# header only library -RDEPEND="" -DEPEND="test? ( >=dev-cpp/gtest-1.9.0_pre20190607 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch" - "${FILESDIR}/${PN}-3.0.0-use_system_gtest.patch" -) - -src_configure() { - local mycmakeargs=( - -DGSL_TEST=$(usex test) - ) - cmake_src_configure -} |