Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/configure mk/configure: Replace SET(CMAKE_MODULE_PA...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f9f3e9350ab
branches:  trunk
changeset: 434240:4f9f3e9350ab
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Jun 13 15:11:11 2020 +0000

description:
mk/configure: Replace SET(CMAKE_MODULE_PATH... like 'set' too.

This will break print/scribus-qt4.
It uses CMAKE_MODULE_PATH as not a directory list.
It is wrong assumption.

diffstat:

 mk/configure/cmake.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r bffc3b644564 -r 4f9f3e9350ab mk/configure/cmake.mk
--- a/mk/configure/cmake.mk     Sat Jun 13 15:08:16 2020 +0000
+++ b/mk/configure/cmake.mk     Sat Jun 13 15:11:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cmake.mk,v 1.18 2020/05/12 17:36:20 rillig Exp $
+# $NetBSD: cmake.mk,v 1.19 2020/06/13 15:11:11 ryoon Exp $
 #
 # This file handles packages that use CMake as their primary build
 # system. For more information about CMake, see http://www.cmake.org/.
@@ -83,7 +83,9 @@
 SUBST_MESSAGE.cmake=   Fixing CMAKE_MODULE_PATH in CMakeLists.txt
 SUBST_FILES.cmake=     ${CMAKE_MODULE_PATH_OVERRIDE}
 SUBST_SED.cmake=       \
-       's|set *( *CMAKE_MODULE_PATH |set (CMAKE_MODULE_PATH "${_CMAKE_DIR}" |'
+       -e 's|set *( *CMAKE_MODULE_PATH |set (CMAKE_MODULE_PATH "${_CMAKE_DIR}" |'
+SUBST_SED.cmake+=      \
+       -e 's|SET *( *CMAKE_MODULE_PATH |SET (CMAKE_MODULE_PATH "${_CMAKE_DIR}" |'
 SUBST_NOOP_OK.cmake=   yes # not all packages need this
 
 do-configure-pre-hook: __cmake-copy-module-tree



Home | Main Index | Thread Index | Old Index