From ccb1023f9c45d7eccfadba10cd532302c3faf36d Mon Sep 17 00:00:00 2001 From: Alberto Villa Date: Sun, 16 Oct 2011 22:51:26 +0000 Subject: [PATCH] - Distinguish STRIP from WITH_DEBUG. PR: 156543 Submitted by: Pan Tsu --- Mk/bsd.cmake.mk | 9 ++++++--- devel/cmake/Makefile | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk index eeb895b6e1ec..29d39d484402 100644 --- a/Mk/bsd.cmake.mk +++ b/Mk/bsd.cmake.mk @@ -58,11 +58,11 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ -DCMAKE_CXX_FLAGS_DEBUG:STRING="${CXXFLAGS}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \ + -DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \ + -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \ -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ - -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ - -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \ - -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" \ -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES # @@ -80,6 +80,9 @@ CMAKE_INSTALL_PREFIX?= ${PREFIX} CMAKE_BUILD_TYPE?= Debug .else CMAKE_BUILD_TYPE?= Release +.endif + +.if defined(STRIP) && ${STRIP} != "" INSTALL_TARGET?= install/strip .endif diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 1118b8d3792d..4044fb502a3d 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -16,14 +16,14 @@ COMMENT= A cross-platform Makefile generator HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ - --datadir=${DATADIR:S|^${PREFIX}||} \ - --docdir=${DOCSDIR:S|^${PREFIX}||} + --datadir="/${DATADIR_REL}" \ + --docdir="/${DOCSDIR_REL}" CONFIGURE_ENV= MAKE=make MAKE_JOBS_SAFE= yes -.if !defined(WITH_DEBUG) -INSTALL_TARGET=install/strip +.if defined(STRIP) && ${STRIP} != "" +INSTALL_TARGET= install/strip .endif MAN1= ccmake.1 \