BUILD: fix cmake list parsing

because cmake is unable to parse it's own lists properly
minetest · Jan 5, 2014 · 10eea10 · 10eea10
1 parent cb7bb73
commit 10eea10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -185,6 +185,9 @@ if(USE_FREETYPE)
 			if(FREETYPE_FOUND)
 				SET(FREETYPE_PKGCONFIG_FOUND TRUE)
 				SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
+				# because cmake is idiotic
+				string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
+				string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
 			endif(FREETYPE_FOUND)
 		endif(PKG_CONFIG_FOUND)
 	endif(UNIX)
@@ -466,7 +469,7 @@ if(BUILD_CLIENT)
 		if(FREETYPE_PKGCONFIG_FOUND)
 			set_target_properties(${PROJECT_NAME}
 				PROPERTIES
-				COMPILE_FLAGS "${FREETYPE_CFLAGS}"
+				COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
 			)
 		endif(FREETYPE_PKGCONFIG_FOUND)
 		target_link_libraries(

diff --git a/src/cguittfont/CMakeLists.txt b/src/cguittfont/CMakeLists.txt
@@ -7,8 +7,8 @@ add_library(cguittfont xCGUITTFont.cpp)
 if(FREETYPE_PKGCONFIG_FOUND)
 	set_target_properties(cguittfont
 		PROPERTIES
-		COMPILE_FLAGS "${FREETYPE_CFLAGS}"
-		LINK_FLAGS "${FREETYPE_LDFLAGS}"
+		COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
+		LINK_FLAGS "${FREETYPE_LDFLAGS_STR}"
 	)
 
 	include_directories(