diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
| commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
| tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /dev-cpp/ms-gsl/files | |
| parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) | |
gentoo resync : 25.01.2018
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 + |