pkgsrc-Changes archive

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

CVS commit: pkgsrc/mk/configure



Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 21 11:13:35 UTC 2016

Modified Files:
        pkgsrc/mk/configure: cmake.mk

Log Message:
Add support for overloading CMAKE_INSTALL_PREFIX

By default CMAKE_INSTALL_PREFIX points to PREFIX, but some software requres
custom subprefix. At least blender and brlcad are in this category.

To set new prefix it's sufficient to set CMAKE_INSTALL_PREFIX in a package,
for example (in brlcad):

CMAKE_INSTALL_PREFIX=${PREFIX}/brlcad

Reviewed by <joerg> and <jperkin>.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/configure/cmake.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/configure/cmake.mk
diff -u pkgsrc/mk/configure/cmake.mk:1.13 pkgsrc/mk/configure/cmake.mk:1.14
--- pkgsrc/mk/configure/cmake.mk:1.13   Wed Feb 24 15:24:56 2016
+++ pkgsrc/mk/configure/cmake.mk        Fri Oct 21 11:13:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: cmake.mk,v 1.13 2016/02/24 15:24:56 jperkin Exp $
+# $NetBSD: cmake.mk,v 1.14 2016/10/21 11:13:35 kamil Exp $
 #
 # This file handles packages that use CMake as their primary build
 # system. For more information about CMake, see http://www.cmake.org/.
@@ -27,12 +27,17 @@
 #      If set to yes, set GNU standard installation directories with pkgsrc
 #      configured settings.  The default is yes.
 #
+# CMAKE_INSTALL_PREFIX
+#      Destination directory to install software. The default is ${PREFIX}.
+#
 
 _CMAKE_DIR=    ${BUILDLINK_DIR}/cmake-Modules
 
 CMAKE_USE_GNU_INSTALL_DIRS?=   yes
 
-CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}
+CMAKE_INSTALL_PREFIX?= ${PREFIX}
+
+CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
 CMAKE_ARGS+=   -DCMAKE_MODULE_PATH:PATH=${_CMAKE_DIR}
 .if ${OPSYS} != "Darwin"
 CMAKE_ARGS+=   -DCMAKE_SKIP_RPATH:BOOL=TRUE



Home | Main Index | Thread Index | Old Index