+Add support for SDL2_ttf library

external/CMakeLists.txt

@@ -33,12 +33,12 @@ get_add_list_by_dependency(EXTERNAL_LIST)
 foreach(EXTERNAL_CMAKE_DIR ${EXTERNAL_LIST})
   message(STATUS "Adding external library '${EXTERNAL_CMAKE_DIR}'")
 
-  # Add the subdirectory target
-  add_subdirectory(${EXTERNAL_CMAKE_DIR})
-
   # Get the uppercase version of the subdirectory name
   string(TOUPPER ${EXTERNAL_CMAKE_DIR} EXTERNAL_NAME)
 
+  # Add the subdirectory target
+  add_subdirectory(${EXTERNAL_CMAKE_DIR})
+
   # Parse this modules library dependencies
   parse_arguments(THIS "${${EXTERNAL_NAME}_DEPS}" "" ${${EXTERNAL_NAME}_LIB_DEPS})
 

external/SDL2/CMakeLists-replace.txt

@@ -248,7 +248,6 @@ set_option(DIRECTX             "Use DirectX for Windows audio/video" ${WINDOWS})
 set_option(RENDER_D3D          "Enable the Direct3D render driver" ${WINDOWS})
 
 
-# The options below are for compatibility to configure's default behaviour.
 if(${BUILD_SHARED_LIBS})
   set(SDL_SHARED ON CACHE BOOL "Build a shared version of the library")
   set(SDL_STATIC OFF CACHE BOOL "Build a static version of the library")

external/SDL2/Options.cmake

@@ -51,12 +51,12 @@ if(SDL2_ENABLED)
   # Define the libraries produced by this external module
 
   # Define the global list of libraries produced by this external module
-  set(FIND_LIBRARIES SDL2)
+  set(FIND_LIBRARIES SDL2 SDL2main)
 
   # Define the include directory to reference for this external module
   set(FIND_INCLUDE_DIR
-    ${TOPLEVEL_DIR}/${EXTERNAL_OPTION_DIR}
-    ${PROJECT_BINARY_DIR}/${EXTERNAL_OPTION_DIR}/clone)
+    ${TOPLEVEL_DIR}/${EXTERNAL_OPTION_DIR}/include
+    ${PROJECT_BINARY_DIR}/${EXTERNAL_OPTION_DIR}/clone/include)
 
   # Create the Find.cmake module for this external module
   configure_file(${PROJECT_SOURCE_DIR}/${EXTERNAL_OPTION_DIR}/FindModule.in