svn commit: r375798 - head/devel/cmake

[Raphael Kubo da Costa]

Author: rakuco
Date: Mon Dec 29 20:10:20 2014
New Revision: 375798
URL: https://svnweb.freebsd.org/changeset/ports/375798
QAT: https://qat.redports.org/buildarchive/r375798/

Log:
  Check for WITH_DEBUG when changing INSTALL_TARGET.
  
  We have the same problem described in https://reviews.freebsd.org/D875:
  > bsd.ports.mk sets STRIP= after all Uses files have been processed
  > initially. If you have WITH_DEBUG=yes set, cmake's INSTALL_TARGET has been
  > set already to install/strip, before STRIP is reset.
  
  In other words, INSTALL_TARGET would always be set to "install/strip"
  even when WITH_DEBUG was set.
  
  Since we do not use USES=cmake here the fix (check for WITH_DEBUG besides
  evaluating STRIP) needs to be duplicated in the Makefile.

Modified:
  head/devel/cmake/Makefile

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Mon Dec 29 18:37:28 2014	(r375797)
+++ head/devel/cmake/Makefile	Mon Dec 29 20:10:20 2014	(r375798)
@@ -23,7 +23,9 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${PATCHDIR}/InitialCache.cmake"
 
-.if defined(STRIP) && ${STRIP} != ""
+.include <bsd.port.pre.mk>
+
+.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET=	install/strip
 .endif
 
@@ -62,4 +64,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>