Merge pull request #2172 from Flakebi/fix-font_tool

Fix Font tool build failure with CMake 3.2
This commit is contained in:
Deve 2015-05-03 08:53:15 +02:00
commit 6082a4502b

View File

@ -11,6 +11,7 @@ if(FONT_TOOL)
if(UNIX AND NOT APPLE)
find_package(Xrandr REQUIRED)
find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR})
if(NOT XRANDR_FOUND)
message(STATUS "XRANDR not found.")
endif()
@ -27,6 +28,7 @@ if(FONT_TOOL)
if(UNIX AND NOT APPLE)
target_link_libraries(font_tool ${XRANDR_LIBRARIES})
target_link_libraries(font_tool ${X11_Xft_LIB} Xxf86vm)
target_link_libraries(font_tool ${X11_LIBRARIES})
endif()
else()
message(STATUS "Freetype was not found, the font tool won't be built (only useful for developers)")