diff options
| author |   Jan Henke <Jan.Henke@taujhe.de> | 2018-01-18 15:52:27 +0100 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2018-01-22 22:51:41 +0100 |
| commit | aa71e140d4960cc1f8b11630674c6cb29901f9f6 (patch) | |
| tree | adea6db78daa51ffc6ae5699f488fa9cc5010cad /dev-cpp/ms-gsl/files | |
| parent | media-libs/openimageio: version bump to 1.8.7. (diff) | |
| download | gentoo-aa71e140d4960cc1f8b11630674c6cb29901f9f6.tar.gz gentoo-aa71e140d4960cc1f8b11630674c6cb29901f9f6.tar.bz2 gentoo-aa71e140d4960cc1f8b11630674c6cb29901f9f6.zip | |
dev-cpp/gsl: renamed to dev-cpp/ms-gsl.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://bugs.gentoo.org/644944
Closes: https://github.com/gentoo/gentoo/pull/6897
Diffstat (limited to 'dev-cpp/ms-gsl/files')
| -rw-r--r-- | dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch new file mode 100644 index 000000000000..12d92605dda8 --- /dev/null +++ b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch @@ -0,0 +1,21 @@ +Add CMake option to disable upstream's catch download, we always want to use the +system wide installed version. Gentoo bug 636828. + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 86ce5a4..b36df56 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -10,7 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS + "-DNO_SELFTEST=true" + ) + +-if(GIT_FOUND) ++option(FORCE_SYSTEM_CATCH "Force usage of system-wide catch install" OFF) ++ ++if(NOT ${FORCE_SYSTEM_CATCH} AND GIT_FOUND) + # add catch + ExternalProject_Add( + catch +-- +2.13.6 + |