Skip to content

Commit 10eea10

Browse files
hasufellIlya Zhuravlev
authored and
Ilya Zhuravlev
committedJan 5, 2014
BUILD: fix cmake list parsing
because cmake is unable to parse it's own lists properly
1 parent cb7bb73 commit 10eea10

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
 

‎src/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ if(USE_FREETYPE)
185185
if(FREETYPE_FOUND)
186186
SET(FREETYPE_PKGCONFIG_FOUND TRUE)
187187
SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
188+
# because cmake is idiotic
189+
string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
190+
string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
188191
endif(FREETYPE_FOUND)
189192
endif(PKG_CONFIG_FOUND)
190193
endif(UNIX)
@@ -466,7 +469,7 @@ if(BUILD_CLIENT)
466469
if(FREETYPE_PKGCONFIG_FOUND)
467470
set_target_properties(${PROJECT_NAME}
468471
PROPERTIES
469-
COMPILE_FLAGS "${FREETYPE_CFLAGS}"
472+
COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
470473
)
471474
endif(FREETYPE_PKGCONFIG_FOUND)
472475
target_link_libraries(

‎src/cguittfont/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ add_library(cguittfont xCGUITTFont.cpp)
77
if(FREETYPE_PKGCONFIG_FOUND)
88
set_target_properties(cguittfont
99
PROPERTIES
10-
COMPILE_FLAGS "${FREETYPE_CFLAGS}"
11-
LINK_FLAGS "${FREETYPE_LDFLAGS}"
10+
COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
11+
LINK_FLAGS "${FREETYPE_LDFLAGS_STR}"
1212
)
1313

1414
include_directories(

0 commit comments

Comments
 (0)
Please sign in to comment.