diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-27 17:52:58 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-10-27 17:54:36 +0200 |
| commit | 85129545ab1c57b74ed4a37c44e756c71755488e (patch) | |
| tree | 1af0c82940428f949182aead120b1b4a28dc339d /sci-geosciences/qgis | |
| parent | media-gfx/pngcheck: EAPI7, drop superfluous || die (diff) | |
| download | gentoo-85129545ab1c57b74ed4a37c44e756c71755488e.tar.gz gentoo-85129545ab1c57b74ed4a37c44e756c71755488e.tar.bz2 gentoo-85129545ab1c57b74ed4a37c44e756c71755488e.zip | |
sci-geosciences/qgis: Fix patch
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'sci-geosciences/qgis')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch index 8787dc09196d..8b841a39b50f 100644 --- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch +++ b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch @@ -7,25 +7,20 @@ Subject: [PATCH 1/2] Use FeatureSummary CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed0a84013a..26f4659f61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON) - # set path to additional CMake modules - SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +--- a/CMakeLists.txt 2018-10-27 17:19:26.188192919 +0200 ++++ b/CMakeLists.txt 2018-10-27 17:19:13.915507445 +0200 +@@ -68,6 +68,8 @@ + endif(USE_CCACHE) + endif(NOT MSVC) +include(FeatureSummary) + # in generated makefiles use relative paths so the project dir is moveable # Note commented out since it cause problems but it would be nice to resolve these and enable # -@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX) - SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") - INCLUDE(CPack) - ENDIF (WITH_CORE) +@@ -935,3 +937,5 @@ + IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") + ADD_SUBDIRECTORY(linux) + ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux") + +FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.12.2 - |