Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-24 00:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: fix cmake list parsing

Browse Source 
because cmake is unable to parse it's own lists properly
This commit is contained in:
hasufell 2014-01-03 16:15:14 +01:00 committed by Ilya Zhuravlev
parent cb7bb736c7
commit 10eea107ed
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -185,6 +185,9 @@ if(USE_FREETYPE)
if(FREETYPE_FOUND) if(FREETYPE_FOUND)
SET(FREETYPE_PKGCONFIG_FOUND TRUE) SET(FREETYPE_PKGCONFIG_FOUND TRUE)
SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES}) 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(FREETYPE_FOUND)
endif(PKG_CONFIG_FOUND) endif(PKG_CONFIG_FOUND)
endif(UNIX) endif(UNIX)
@ -466,7 +469,7 @@ if(BUILD_CLIENT)
if(FREETYPE_PKGCONFIG_FOUND) if(FREETYPE_PKGCONFIG_FOUND)
set_target_properties(${PROJECT_NAME} set_target_properties(${PROJECT_NAME}
PROPERTIES PROPERTIES
COMPILE_FLAGS "${FREETYPE_CFLAGS}" COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
) )
endif(FREETYPE_PKGCONFIG_FOUND) endif(FREETYPE_PKGCONFIG_FOUND)
target_link_libraries( target_link_libraries(

4
src/cguittfont/CMakeLists.txt
View File

@ -7,8 +7,8 @@ add_library(cguittfont xCGUITTFont.cpp)
if(FREETYPE_PKGCONFIG_FOUND) if(FREETYPE_PKGCONFIG_FOUND)
set_target_properties(cguittfont set_target_properties(cguittfont
PROPERTIES PROPERTIES
COMPILE_FLAGS "${FREETYPE_CFLAGS}" COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
LINK_FLAGS "${FREETYPE_LDFLAGS}" LINK_FLAGS "${FREETYPE_LDFLAGS_STR}"
) )
include_directories( include_directories(