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

Collapse All | Expand All

(-)Makefile (-2 lines)
Lines 12-19 Link Here
12
12
13
LICENSE=	MIT
13
LICENSE=	MIT
14
14
15
BROKEN_powerpc64=	fails to build: ninja: build.ninja:386: bad $-escape (literal $ must be written as $$)
16
17
USES=		cmake
15
USES=		cmake
18
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
19
CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON -DYAML_CPP_BUILD_TOOLS=0
17
CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON -DYAML_CPP_BUILD_TOOLS=0
(-)files/patch-CMakeLists.txt (+14 lines)
Lines 1-5 Link Here
1
--- CMakeLists.txt.orig	2013-04-14 03:37:53.000000000 +0400
1
--- CMakeLists.txt.orig	2013-04-14 03:37:53.000000000 +0400
2
+++ CMakeLists.txt	2014-09-11 17:37:09.000000000 +0400
2
+++ CMakeLists.txt	2014-09-11 17:37:09.000000000 +0400
3
@@ -139,11 +139,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
4
	#
5
	set(CMAKE_CXX_FLAGS "-Wall ${GCC_EXTRA_OPTIONS} -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}")
6
	#
7
-	add_custom_target(debuggable $(MAKE) clean
8
+	add_custom_target(debuggable make clean
9
		COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR}
10
		COMMENT "Adjusting settings for debug compilation"
11
		VERBATIM)
12
-	add_custom_target(releasable $(MAKE) clean
13
+	add_custom_target(releasable make clean
14
		COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR}
15
		COMMENT "Adjusting settings for release compilation"
16
		VERBATIM)
3
@@ -240,7 +240,7 @@
17
@@ -240,7 +240,7 @@
4
 
18
 
5
 set_target_properties(yaml-cpp PROPERTIES
19
 set_target_properties(yaml-cpp PROPERTIES

Return to bug 232563