View | Details | Raw Unified | Return to bug 156901 | Differences between
and this patch

Collapse All | Expand All

(-)net/crtmpserver/Makefile (-1 / +1 lines)
Lines 18-24 Link Here
18
WRKSRC=	${WRKDIR}/crtmpserver-545
18
WRKSRC=	${WRKDIR}/crtmpserver-545
19
19
20
USE_CMAKE=	yes
20
USE_CMAKE=	yes
21
CMAKE_ENV=	"COMPILE_STATIC=1"
21
CONFIGURE_ENV+=	COMPILE_STATIC=1
22
CMAKE_OUTSOURCE=	yes
22
CMAKE_OUTSOURCE=	yes
23
CMAKE_SOURCE_PATH=	${WRKSRC}/builders/cmake
23
CMAKE_SOURCE_PATH=	${WRKSRC}/builders/cmake
24
CMAKE_BUILD_TYPE=	Release
24
CMAKE_BUILD_TYPE=	Release
(-)net/crtmpserver/files/patch-builders-cmake-cmake_find_modules-pch_support.cmake (+24 lines)
Line 0 Link Here
1
--- builders/cmake/cmake_find_modules/pch_support.cmake.orig	2011-07-25 13:01:58.000000000 +0200
2
+++ builders/cmake/cmake_find_modules/pch_support.cmake	2011-09-08 21:28:22.000000000 +0200
3
@@ -1,9 +1,11 @@
4
 #This code is taken from here:
5
 #http://www.mail-archive.com/cmake@cmake.org/msg04394.html
6
 
7
+STRING(REGEX REPLACE "[	 ]+" ";" _CMAKE_CXX_COMPILER_ARG1 "${CMAKE_CXX_COMPILER_ARG1}")
8
+
9
 IF(CMAKE_COMPILER_IS_GNUCXX)
10
     EXEC_PROGRAM(
11
-        ${CMAKE_CXX_COMPILER} 
12
+        ${CMAKE_CXX_COMPILER} ${_CMAKE_CXX_COMPILER_ARG1}
13
         ARGS                    --version 
14
         OUTPUT_VARIABLE _compiler_output)
15
     STRING(REGEX REPLACE ".* ([0-9]\\.[0-9]\\.[0-9]) .*" "\\1" 
16
@@ -57,7 +59,7 @@
17
 	#compute the new command
18
 	ADD_CUSTOM_COMMAND(
19
 		OUTPUT ${_output}
20
-		COMMAND ${CMAKE_CXX_COMPILER} ${PCH_CXX_FLAGS} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}
21
+		COMMAND ${CMAKE_CXX_COMPILER} ${_CMAKE_CXX_COMPILER_ARG1} ${PCH_CXX_FLAGS} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}
22
 		DEPENDS ${_source}
23
 	)
24
         

Return to bug 156901