diff --git a/CMakeLists.txt b/CMakeLists.txt index fb1167f93..a57d1168f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ if (NOT WIN32 AND NOT ANDROID) endif() # Include our extra modules -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/) +list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/) if((CMAKE_SYSTEM_NAME MATCHES "WindowsStore") AND (CMAKE_SYSTEM_VERSION MATCHES "10.0")) set(UWP 1) diff --git a/client/SDL/dialogs/CMakeLists.txt b/client/SDL/dialogs/CMakeLists.txt index 16cfa1022..a7e9efd85 100644 --- a/client/SDL/dialogs/CMakeLists.txt +++ b/client/SDL/dialogs/CMakeLists.txt @@ -1,7 +1,3 @@ - - -find_package(SDL2_ttf REQUIRED COMPONENTS) -include_directories(${SDL2_ttf_INCLUDE_DIR}) set(SRCS sdl_button.hpp sdl_button.cpp @@ -26,14 +22,27 @@ set(LIBS font winpr ) -if (BUILD_SHARED_LIBS) - list(APPEND LIBS - SDL2_ttf::SDL2_ttf - ) + +find_package(SDL2_ttf COMPONENTS) +if (NOT SDL2_ttf_FOUND) + find_package(PkgConfig REQUIRED) + pkg_check_modules(SDL2_ttf REQUIRED SDL2_ttf) + + if (BUILD_SHARED_LIBS) + list(APPEND LIBS ${SDL2_ttf_LIBRARIES}) + link_directories(${SDL2_ttf_LIBRARY_DIRS}) + include_directories(${SDL2_ttf_INCLUDE_DIRS}) + else() + list(APPEND LIBS ${SDL2_ttf_STATIC_LIBRARIES}) + link_directories(${SDL2_ttf_STATIC_LIBRARY_DIRS}) + include_directories(${SDL2_ttf_STATIC_INCLUDE_DIRS}) + endif() else() - list(APPEND LIBS - SDL2_ttf::SDL2_ttf-static - ) + if (BUILD_SHARED_LIBS) + list(APPEND LIBS SDL2_ttf::SDL2_ttf) + else() + list(APPEND LIBS SDL2_ttf::SDL2_ttf-static) + endif() endif() add_subdirectory(font) @@ -45,5 +54,5 @@ add_library(dialogs STATIC target_link_libraries(dialogs PRIVATE ${LIBS}) if(BUILD_TESTING) - add_subdirectory(test) +# add_subdirectory(test) endif() diff --git a/client/SDL/dialogs/test/CMakeLists.txt b/client/SDL/dialogs/test/CMakeLists.txt index 7c7b82163..c1003d4c1 100644 --- a/client/SDL/dialogs/test/CMakeLists.txt +++ b/client/SDL/dialogs/test/CMakeLists.txt @@ -1,7 +1,7 @@ set(MODULE_NAME "TestSDL") set(MODULE_PREFIX "TEST_SDL") -set(DRIVER ${MODULE_NAME}.c) +set(DRIVER ${MODULE_NAME}.cpp) set(TEST_SRCS TestSDLDialogs.cpp @@ -11,7 +11,7 @@ create_test_sourcelist(SRCS ${DRIVER} ${TEST_SRCS}) -add_executable(${MODULE_NAME} ${SRCS}) +add_library(${MODULE_NAME} ${SRCS}) list(APPEND LIBS dialogs diff --git a/client/SDL/dialogs/test/TestSDLDialogs.cpp b/client/SDL/dialogs/test/TestSDLDialogs.cpp index f144195b5..558fb4c6e 100644 --- a/client/SDL/dialogs/test/TestSDLDialogs.cpp +++ b/client/SDL/dialogs/test/TestSDLDialogs.cpp @@ -1,6 +1,7 @@ #include "../sdl_selectlist.hpp" #include "../sdl_input_widgets.hpp" +#include #include BOOL sdl_log_error_ex(Uint32 res, wLog* log, const char* what, const char* file, size_t line, @@ -62,7 +63,12 @@ static bool test_select_dialog() return true; } -extern "C" int TestSDLDialogs(int argc, char* argv[]) +extern "C" +{ + FREERDP_API int TestSDLDialogs(int argc, char* argv[]); +} + +int TestSDLDialogs(int argc, char* argv[]) { int rc = 0; diff --git a/cmake/FindSDL2_ttf.cmake b/cmake/FindSDL2_ttf.cmake deleted file mode 100644 index ccb39d447..000000000 --- a/cmake/FindSDL2_ttf.cmake +++ /dev/null @@ -1,177 +0,0 @@ -# Locate SDL2 library -# This module defines -# SDL2_LIBRARY, the name of the library to link against -# SDL2_FOUND, if false, do not try to link to SDL2 -# SDL2_INCLUDE_DIR, where to find SDL.h -# -# This module responds to the the flag: -# SDL2_BUILDING_LIBRARY -# If this is defined, then no SDL2main will be linked in because -# only applications need main(). -# Otherwise, it is assumed you are building an application and this -# module will attempt to locate and set the the proper link flags -# as part of the returned SDL2_LIBRARY variable. -# -# Don't forget to include SDLmain.h and SDLmain.m your project for the -# OS X framework based version. (Other versions link to -lSDL2main which -# this module will try to find on your behalf.) Also for OS X, this -# module will automatically add the -framework Cocoa on your behalf. -# -# -# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration -# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library -# (SDL2.dll, libsdl2.so, SDL2.framework, etc). -# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. -# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value -# as appropriate. These values are used to generate the final SDL2_LIBRARY -# variable, but when these values are unset, SDL2_LIBRARY does not get created. -# -# -# $SDL2DIR is an environment variable that would -# correspond to the ./configure --prefix=$SDL2DIR -# used in building SDL2. -# l.e.galup 9-20-02 -# -# Modified by Eric Wing. -# Added code to assist with automated building by using environmental variables -# and providing a more controlled/consistent search behavior. -# Added new modifications to recognize OS X frameworks and -# additional Unix paths (FreeBSD, etc). -# Also corrected the header search path to follow "proper" SDL guidelines. -# Added a search for SDL2main which is needed by some platforms. -# Added a search for threads which is needed by some platforms. -# Added needed compile switches for MinGW. -# -# On OSX, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of -# SDL2_LIBRARY to override this selection or set the CMake environment -# CMAKE_INCLUDE_PATH to modify the search paths. -# -# Note that the header path has changed from SDL2/SDL.h to just SDL.h -# This needed to change because "proper" SDL convention -# is #include "SDL.h", not . This is done for portability -# reasons because not all systems place things in SDL2/ (see FreeBSD). - -#============================================================================= -# Copyright 2003-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -SET(SDL2TTF_SEARCH_PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts - /opt/csw # Blastwave - /opt -) - -FIND_PATH(SDL2TTF_INCLUDE_DIR SDL_ttf.h - HINTS - $ENV{SDL2TTFDIR} - PATH_SUFFIXES include/SDL2 include - PATHS ${SDL2TTF_SEARCH_PATHS} -) - -FIND_LIBRARY(SDL2TTF_LIBRARY_TEMP - NAMES SDL2_ttf - HINTS - $ENV{SDL2TTFDIR} - PATH_SUFFIXES lib64 lib - 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 - # SDL2TTFmain. This is mainly for Windows and OS X. Other (Unix) platforms - # seem to provide SDL2TTFmain for compatibility even though they don't - # necessarily need it. - FIND_LIBRARY(SDL2TTFMAIN_LIBRARY - NAMES SDL2_ttf - HINTS - $ENV{SDL2TTFDIR} - PATH_SUFFIXES lib64 lib - PATHS ${SDL2TTF_SEARCH_PATHS} - ) - ENDIF(NOT ${SDL2TTF_INCLUDE_DIR} MATCHES ".framework") -ENDIF(NOT SDL2TTF_BUILDING_LIBRARY) - -# SDL2TTF may require threads on your system. -# The Apple build may not need an explicit flag because one of the -# frameworks may already provide it. -# But for non-OSX systems, I will use the CMake Threads package. -IF(NOT APPLE) - FIND_PACKAGE(Threads) -ENDIF(NOT APPLE) - -# MinGW needs an additional library, mwindows -# It's total link flags should look like -lmingw32 -lSDL2TTFmain -lSDL2TTF -lmwindows -# (Actually on second look, I think it only needs one of the m* libraries.) -IF(MINGW) - SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") -ENDIF(MINGW) - -IF(SDL2TTF_LIBRARY_TEMP) - # For SDL2TTFmain - IF(NOT SDL2TTF_BUILDING_LIBRARY) - IF(SDL2TTFMAIN_LIBRARY) - SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTFMAIN_LIBRARY} ${SDL2TTF_LIBRARY_TEMP}) - ENDIF(SDL2TTFMAIN_LIBRARY) - ENDIF(NOT SDL2TTF_BUILDING_LIBRARY) - - # For OS X, SDL2TTF uses Cocoa as a backend so it must link to Cocoa. - # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. - # I think it has something to do with the CACHE STRING. - # So I use a temporary variable until the end so I can set the - # "real" variable in one-shot. - IF(APPLE) - SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} "-framework Cocoa") - ENDIF(APPLE) - - # For threads, as mentioned Apple doesn't need this. - # In fact, there seems to be a problem if I used the Threads package - # and try using this line, so I'm just skipping it entirely for OS X. - IF(NOT APPLE) - SET(SDL2TTF_LIBRARY_TEMP ${SDL2TTF_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(NOT APPLE) - - # For MinGW library - IF(MINGW) - SET(SDL2TTF_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2TTF_LIBRARY_TEMP}) - ENDIF(MINGW) - - # Set the final string here so the GUI reflects the final state. - if(FREETYPE_LIBRARY_TEMP) - SET(SDL2TTF_LIBRARY "${SDL2TTF_LIBRARY_TEMP};${FREETYPE_LIBRARY_TEMP}" CACHE STRING "Where the SDL2TTF Library can be found") - else() - SET(SDL2TTF_LIBRARY "${SDL2TTF_LIBRARY_TEMP}" CACHE STRING "Where the SDL2TTF Library can be found") - endif() - - # 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)