aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authormakc <makc@FreeBSD.org>2009-03-25 03:11:23 +0800
committermakc <makc@FreeBSD.org>2009-03-25 03:11:23 +0800
commit7b4639d20c13a32165e09360f232cbf52ac84504 (patch)
tree99b1e4f31f9c29a02c1b60dc4aee185328dc5e71 /Mk
parent34f4bf1e38b30974641b9f8900fb4e2dffe750d7 (diff)
downloadfreebsd-ports-gnome-7b4639d20c13a32165e09360f232cbf52ac84504.tar.gz
freebsd-ports-gnome-7b4639d20c13a32165e09360f232cbf52ac84504.tar.zst
freebsd-ports-gnome-7b4639d20c13a32165e09360f232cbf52ac84504.zip
Update devel/cmake to 2.6.3.
- Set INSTALL_TARGET for cmake based ports to install/strip. This solves problem of installing non-stripped binaries (noticed by delphij for KDE4 ports) - Fix linking to -lpthread for cmake based ports (KDE4 ports are affected mostly)
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.cmake.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk
index 5fcd8cf2b617..ba5c583c122d 100644
--- a/Mk/bsd.cmake.mk
+++ b/Mk/bsd.cmake.mk
@@ -48,7 +48,8 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \
-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
- -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}"
+ -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
+ -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES
#
# Default build type and sourcedir
@@ -73,7 +74,7 @@ CMAKE_ARGS+= -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
# Strip binaries
#
.if !defined(WITH_DEBUG)
-CMAKE_ARGS+= -DCMAKE_INSTALL_DO_STRIP:BOOL=ON
+INSTALL_TARGET?= install/strip
.endif
#