diff --git a/client/SDL/dialogs/CMakeLists.txt b/client/SDL/dialogs/CMakeLists.txt index 56e05d89a..8f19b4402 100644 --- a/client/SDL/dialogs/CMakeLists.txt +++ b/client/SDL/dialogs/CMakeLists.txt @@ -17,8 +17,8 @@ set(SRCS sdl_input_widgets.hpp sdl_select.hpp sdl_select.cpp - sdl_selectlist.hpp - sdl_selectlist.cpp + sdl_selectlist.hpp + sdl_selectlist.cpp ) set(LIBS diff --git a/cmake/FindSDL2TTF.cmake b/cmake/FindSDL2TTF.cmake index be8e7bc8b..26cfa060f 100644 --- a/cmake/FindSDL2TTF.cmake +++ b/cmake/FindSDL2TTF.cmake @@ -91,6 +91,14 @@ FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP PATHS ${SDL2TTF_SEARCH_PATHS} ) +FIND_LIBRARY(FREETYPE_LIBRARY_TEMP + NAMES freetype + HINTS + $ENV{SDL2TTFDIR} + PATH_SUFFIXES lib64 lib + PATHS ${SDL2TTF_SEARCH_PATHS} +) + IF(NOT SDL2TTF_BUILDING_LIBRARY) IF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework") # Non-OS X framework versions expect you to also dynamically link to @@ -153,11 +161,12 @@ IF(SDL2TTF_LIBRARY_TEMP) ENDIF(MINGW) # Set the final string here so the GUI reflects the final state. - SET(SDL2TTF_LIBRARY ${SDL2TTF_LIBRARY_TEMP} CACHE STRING "Where the SDL2TTF Library can be found") + SET(SDL2TTF_LIBRARY "${SDL2TTF_LIBRARY_TEMP};${FREETYPE_LIBRARY_TEMP}" CACHE STRING "Where the SDL2TTF Library can be found") # Set the temp variable to INTERNAL so it is not seen in the CMake GUI SET(SDL2TTF_LIBRARY_TEMP "${SDL2TTF_LIBRARY_TEMP}" CACHE INTERNAL "") + SET(FREETYPE_LIBRARY_TEMP "${FREETYPE_LIBRARY_TEMP}" CACHE INTERNAL "") ENDIF(SDL2TTF_LIBRARY_TEMP) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2TTF REQUIRED_VARS SDL2TTF_LIBRARY SDL2TTF_INCLUDE_DIR) \ No newline at end of file +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2TTF REQUIRED_VARS SDL2TTF_LIBRARY SDL2TTF_INCLUDE_DIR)