mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cmake] require freetype for sdl2ttf

Browse Source
This commit is contained in:
Armin Novak 2023-07-24 10:23:27 +02:00 committed by Martin Fleisz
parent f9ed8bb1b7
commit 4816a7d2a5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/SDL/dialogs/CMakeLists.txt
View File

@ -17,8 +17,8 @@ set(SRCS
sdl_input_widgets.hpp sdl_input_widgets.hpp
sdl_select.hpp sdl_select.hpp
sdl_select.cpp sdl_select.cpp
sdl_selectlist.hpp sdl_selectlist.hpp
sdl_selectlist.cpp sdl_selectlist.cpp
) )
set(LIBS set(LIBS

13
cmake/FindSDL2TTF.cmake
View File

@ -91,6 +91,14 @@ FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP
PATHS ${SDL2TTF_SEARCH_PATHS} 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_BUILDING_LIBRARY)
IF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework") IF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to # Non-OS X framework versions expect you to also dynamically link to
@ -153,11 +161,12 @@ IF(SDL2TTF_LIBRARY_TEMP)
ENDIF(MINGW) ENDIF(MINGW)
# Set the final string here so the GUI reflects the final state. # 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 the temp variable to INTERNAL so it is not seen in the CMake GUI
SET(SDL2TTF_LIBRARY_TEMP "${SDL2TTF_LIBRARY_TEMP}" CACHE INTERNAL "") SET(SDL2TTF_LIBRARY_TEMP "${SDL2TTF_LIBRARY_TEMP}" CACHE INTERNAL "")
SET(FREETYPE_LIBRARY_TEMP "${FREETYPE_LIBRARY_TEMP}" CACHE INTERNAL "")
ENDIF(SDL2TTF_LIBRARY_TEMP) ENDIF(SDL2TTF_LIBRARY_TEMP)
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2TTF REQUIRED_VARS SDL2TTF_LIBRARY SDL2TTF_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2TTF REQUIRED_VARS SDL2TTF_LIBRARY SDL2TTF_INCLUDE_DIR)