pkgsrc-Changes archive

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

CVS commit: pkgsrc/devel/cmake39



Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct  2 12:20:01 UTC 2025

Modified Files:
        pkgsrc/devel/cmake39: build.mk

Log Message:
cmake39: Support out-of-tree builds.

Requires slightly different options to latest cmake.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/cmake39/build.mk

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

Modified files:

Index: pkgsrc/devel/cmake39/build.mk
diff -u pkgsrc/devel/cmake39/build.mk:1.1 pkgsrc/devel/cmake39/build.mk:1.2
--- pkgsrc/devel/cmake39/build.mk:1.1   Thu Oct  2 11:49:44 2025
+++ pkgsrc/devel/cmake39/build.mk       Thu Oct  2 12:20:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.1 2025/10/02 11:49:44 nia Exp $
+# $NetBSD: build.mk,v 1.2 2025/10/02 12:20:01 nia Exp $
 #
 # This Makefile fragment supports building using the CMake build tool.
 #
@@ -71,6 +71,7 @@ CMAKE_LIBRARY_PATH+=  ${COMPILER_LIB_DIRS
 
 CONFIGURE_ENV+=                BUILDLINK_DIR=${BUILDLINK_DIR}
 
+CMAKE_BUILD_DIR?=      cmake-pkgsrc-build
 CMAKE_BUILD_ARGS?=     -j ${_MAKE_JOBS_N:U1}
 CMAKE_INSTALL_ARGS?=   -j ${_MAKE_JOBS_N:U1}
 
@@ -106,10 +107,10 @@ _CMAKE_CONFIGURE_SETTINGS=        yes
 do-configure: cmake-configure
 cmake-configure:
        ${MKDIR} -p ${WRKSRC}/${CONFIGURE_DIR}/${CMAKE_BUILD_DIR}
-       ${RUN} cd ${WRKSRC}/${CONFIGURE_DIR} && \
+       ${RUN} cd ${WRKSRC}/${CONFIGURE_DIR}/${CMAKE_BUILD_DIR} && \
                ${SETENV} ${CONFIGURE_ENV} ${CMAKE_PROGRAM} \
                -G ${_CMAKE_BUILD_SYSTEM:Q} \
-               ${CMAKE_CONFIGURE_ARGS}
+               ${CMAKE_CONFIGURE_ARGS} ..
 .endif
 
 .if !target(do-build)



Home | Main Index | Thread Index | Old Index