diff options
| -rw-r--r-- | Mk/bsd.cmake.mk | 4 | ||||
| -rw-r--r-- | devel/cmake/Makefile | 2 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_Compiler_GNU.cmake | 14 |
3 files changed, 5 insertions, 15 deletions
diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk index 4bdcd1021725..3bfad7cc03bd 100644 --- a/Mk/bsd.cmake.mk +++ b/Mk/bsd.cmake.mk @@ -53,7 +53,11 @@ CMAKE_ENV?= ${CONFIGURE_ENV} CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ + -DCMAKE_C_FLAGS_DEBUG:STRING="${CFLAGS}" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS}" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ + -DCMAKE_CXX_FLAGS_DEBUG:STRING="${CXXFLAGS}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \ -DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \ -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 49967a7e8a33..1118b8d3792d 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -7,7 +7,7 @@ PORTNAME= cmake PORTVERSION= 2.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ diff --git a/devel/cmake/files/patch-Modules_Compiler_GNU.cmake b/devel/cmake/files/patch-Modules_Compiler_GNU.cmake deleted file mode 100644 index 06a5aadf5f67..000000000000 --- a/devel/cmake/files/patch-Modules_Compiler_GNU.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- ./Modules/Compiler/GNU.cmake.orig 2011-02-15 20:47:27.000000000 +0300 -+++ ./Modules/Compiler/GNU.cmake 2011-04-09 13:43:24.030760248 +0400 -@@ -26,9 +26,9 @@ - - # Initial configuration flags. - set(CMAKE_${lang}_FLAGS_INIT "") -- set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g") -+ set(CMAKE_${lang}_FLAGS_DEBUG_INIT "") - set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -- set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") -+ set(CMAKE_${lang}_FLAGS_RELEASE_INIT "") - set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") - set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") - set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") |