From 10eea107edc1c29a5896ea78f98f19f94e49d6c9 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@posteo.de>
Date: Fri, 3 Jan 2014 16:15:14 +0100
Subject: [PATCH] BUILD: fix cmake list parsing
because cmake is unable to parse it's own lists properly
---
src/CMakeLists.txt | 5 ++++-
src/cguittfont/CMakeLists.txt | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2c1e166a..4bc9f890c 100644
--- 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
index d2647ba69..21448ecb8 100644
--- 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(
--
GitLab