> From: Stuart Henderson <st...@openbsd.org>
> Date: Wed, Jan 7, 2015 at 3:26 PM
> Subject: Re: Zap CMAKE_SKIP_INSTALL_ALL_DEPENDENCY
> To: dco...@gmail.com
> Cc: ports@openbsd.org, z...@openbsd.org
> 
> 
> On 2015/01/07 06:16, David Coppa wrote:
> >
> > CMAKE_SKIP_INSTALL_ALL_DEPENDENCY makes no sense anymore since we're
> > using Ninja.
> 
> We don't use Ninja on all arch.

Ok, so what about this?

Index: cmake.port.mk
===================================================================
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 cmake.port.mk
--- cmake.port.mk       31 Dec 2014 11:06:02 -0000      1.35
+++ cmake.port.mk       7 Jan 2015 14:46:46 -0000
@@ -72,8 +72,11 @@ MODCMAKE_configure=  cd ${WRKBUILD} && ${
        CC="${CC}" CFLAGS="${CFLAGS}" \
        CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
        ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
-               -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY:Bool=True \
                -G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
+
+.if ${USE_NINJA:L} == "no"
+CONFIGURE_ARGS += -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY:Bool=True
+.endif
 
 .if defined(DEBUG)
 CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug

Reply via email to