From ad942a9eec4b1d6916f379fc94f95ebee01bd7d5 Mon Sep 17 00:00:00 2001 From: bouyer Date: Wed, 16 Dec 2015 11:29:47 +0000 Subject: Fix build error like: -- Library config detected: Qt3/CMakeLists.txt CMake Error at src/CMakeLists.txt:33 (add_subdirectory): add_subdirectory given source "/usr/tmp/math/cgal/work/CGAL-3.9/src/CGALQt3/CMakeLists.txt" which is not an existing directory. Call Stack (most recent call first): src/CMakeLists.txt:80 (configure_component) I guess the behavior of string(REPLACE ...) changed with the newer version of cmake ... --- math/cgal/distinfo | 3 ++- math/cgal/patches/patch-src-CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 math/cgal/patches/patch-src-CMakeLists.txt (limited to 'math/cgal') diff --git a/math/cgal/distinfo b/math/cgal/distinfo index 35b94e7b93b..18a24bd108a 100644 --- a/math/cgal/distinfo +++ b/math/cgal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 23:33:31 agc Exp $ +$NetBSD: distinfo,v 1.5 2015/12/16 11:29:47 bouyer Exp $ SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47 @@ -7,3 +7,4 @@ Size (CGAL-3.9.tar.gz) = 14276059 bytes SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489 SHA1 (patch-include_CGAL_config.h) = ba29667305fc4868a9995048801408e95d75bd41 SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6 +SHA1 (patch-src-CMakeLists.txt) = 26e92c17b26bce8f0dd5a97ded689764fd243da0 diff --git a/math/cgal/patches/patch-src-CMakeLists.txt b/math/cgal/patches/patch-src-CMakeLists.txt new file mode 100644 index 00000000000..a561c16bb1a --- /dev/null +++ b/math/cgal/patches/patch-src-CMakeLists.txt @@ -0,0 +1,14 @@ +$NetBSD: patch-src-CMakeLists.txt,v 1.1 2015/12/16 11:29:47 bouyer Exp $ + + +--- src/CMakeLists.txt.orig 2015-12-16 12:06:10.000000000 +0100 ++++ src/CMakeLists.txt 2015-12-16 12:11:31.000000000 +0100 +@@ -54,7 +54,7 @@ + file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL*/CMakeLists.txt) + foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE}) + string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile}) +- string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_SUBDIR ${libconfigfile}) ++ string(REPLACE "/CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_SUBDIR ${libconfigfile}) + if (NOT ${CGAL_CONFIGURED_LIBRARY_SUBDIR} STREQUAL "CGAL") + + string(REPLACE "CGAL" "" CGAL_CONFIGURED_LIBRARY_NAME ${CGAL_CONFIGURED_LIBRARY_SUBDIR}) -- cgit v1.2.3