Merge pull request #1027 from kpp/find_sdl2

Find sdl2
8 years ago · 46d3845fb3
parent 3ef9b3f44d ed2c2170f0
commit 46d3845fb3
3 changed files with 59 additions and 129 deletions
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@ -557,12 +557,9 @@ printf "SDL 2.0.3... "
 		eval 7z x -y SDL2-2.0.3.zip $STRIP
 	fi

-	SDL_SDK="`real_pwd`/SDL2-2.0.3"
-	add_cmake_opts -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
-		-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
-		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+	export SDL2DIR="`real_pwd`/SDL2-2.0.3"

-	add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
+	add_runtime_dlls $SDL2DIR/lib/x$ARCHSUFFIX/SDL2.dll

 	echo Done.
 }
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@ -1,16 +1,20 @@
 # Locate SDL2 library
 # This module defines
-# SDL2_LIBRARY, the name of the library to link against
+# SDL2_LIBRARY, the SDL2 library, with no other libraries
+# SDL2_LIBRARIES, the SDL library and required components with compiler flags
 # SDL2_FOUND, if false, do not try to link to SDL2
 # SDL2_INCLUDE_DIR, where to find SDL.h
+# SDL2_VERSION, the version of the found library
 #
+# This module accepts the following env variables
+#  SDL2DIR - Can be set to ./configure --prefix=$SDL2DIR used in building SDL2. l.e.galup 9-20-02
 # This module responds to the the flag:
 # SDL2_BUILDING_LIBRARY
 # If this is defined, then no SDL2_main 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.
+# as part of the returned SDL2_LIBRARIES variable.
 #
 # Don't forget to include SDL2main.h and SDL2main.m your project for the
 # OS X framework based version. (Other versions link to -lSDL2main which
@ -18,20 +22,6 @@
 # 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.
@ -71,126 +61,69 @@
 #  License text for the above reference.)


-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES include/SDL2 include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local/include/SDL2
-  /usr/include/SDL2
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(_sdl_lib_suffix lib/x64)
+else()
+    set(_sdl_lib_suffix lib/x86)
+endif()

-FIND_LIBRARY(SDL2_LIBRARY_PATH
-  NAMES SDL2
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES lib64 lib
-  PATHS
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
+libfind_pkg_detect(SDL2 sdl2
+    FIND_PATH SDL.h
+        HINTS $ENV{SDL2DIR}
+        PATH_SUFFIXES include SDL2
+    FIND_LIBRARY SDL2
+        HINTS $ENV{SDL2DIR}
+        PATH_SUFFIXES ${_sdl_lib_suffix}
 )
+libfind_version_n_header(SDL2 NAMES SDL_version.h DEFINES SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_PATCHLEVEL)

-set(SDL2_LIBRARY_ONLY ${SDL2_LIBRARY_PATH} CACHE STRING "The SDL2 library, with no other libraries.")
-set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_PATH})
-
-#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
-
-IF(NOT SDL2_BUILDING_LIBRARY)
-  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+IF(NOT SDL2_BUILDING_LIBRARY AND NOT APPLE)
    # Non-OS X framework versions expect you to also dynamically link to
    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
    # seem to provide SDL2main for compatibility even though they don't
    # necessarily need it.
-    FIND_LIBRARY(SDL2MAIN_LIBRARY
-      NAMES SDL2main
-      HINTS
-      $ENV{SDL2DIR}
-      PATH_SUFFIXES lib64 lib
-      PATHS
-      /sw
-      /opt/local
-      /opt/csw
-      /opt
+    libfind_pkg_detect(SDL2MAIN sdl2
+        FIND_LIBRARY SDL2main
+            HINTS $ENV{SDL2DIR}
+            PATH_SUFFIXES ${_sdl_lib_suffix}
    )
-  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-# SDL2 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)
+    set(SDL2MAIN_FIND_QUIETLY TRUE)
+    libfind_process(SDL2MAIN)
+    list(APPEND SDL2_PROCESS_LIBS SDL2MAIN_LIBRARY)
+ENDIF()
+
+
+set(SDL2_TARGET_SPECIFIC)
+
+if (APPLE)
+    # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+    list(APPEND SDL2_TARGET_SPECIFIC "-framework Cocoa")
+else()
+    # SDL2 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.
+    libfind_package(SDL2 Threads)
+    list(APPEND SDL2_TARGET_SPECIFIC ${CMAKE_THREAD_LIBS_INIT})
+endif()

 # MinGW needs an additional library, mwindows
 # It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -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)
-
-SET(SDL2_FOUND "NO")
-IF(SDL2_LIBRARY_TEMP)
-  # For SDL2main
-  IF(NOT SDL2_BUILDING_LIBRARY)
-    IF(SDL2MAIN_LIBRARY)
-      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-    ENDIF(SDL2MAIN_LIBRARY)
-  ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-  # For OS X, SDL2 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(SDL2_LIBRARY_TEMP ${SDL2_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(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(NOT APPLE)
-
-  # For MinGW library
-  IF(MINGW)
-    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-  ENDIF(MINGW)
-  
-  IF(WIN32)
-    SET(SDL2_LIBRARY_TEMP winmm imm32 version msimg32 ${SDL2_LIBRARY_TEMP})
-  ENDIF(WIN32)
-
-  # Set the final string here so the GUI reflects the final state.
-  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+if(MINGW)
+    list(APPEND SDL2_TARGET_SPECIFIC mingw32)
+endif()

-  SET(SDL2_FOUND "YES")
-ENDIF(SDL2_LIBRARY_TEMP)
+if(WIN32)
+    list(APPEND SDL2_TARGET_SPECIFIC winmm imm32 version msimg32)
+endif()

-INCLUDE(FindPackageHandleStandardArgs)
+set(SDL2_PROCESS_LIBS SDL2_TARGET_SPECIFIC)

-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+libfind_process(SDL2)

-IF(SDL2_STATIC)
-  if (UNIX AND NOT APPLE)
-    EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS)
-    STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}")
-    SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS})
-  ENDIF()
-ENDIF(SDL2_STATIC)
+if (SDL2_STATIC AND UNIX AND NOT APPLE)
+    execute_process(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_STATIC_FLAGS)
+    string(REGEX REPLACE "(\r?\n)+$" "" SDL2_STATIC_FLAGS "${SDL2_STATIC_FLAGS}")
+    set(SDL2_LIBRARIES ${SDL2_STATIC_FLAGS})
+endif()
--- a/cmake/LibFindMacros.cmake
+++ b/cmake/LibFindMacros.cmake
@ -322,7 +322,7 @@ function (libfind_process PREFIX)
    set(val ${${i}})
    if ("${val}" STREQUAL "${i}-NOTFOUND")
      set (val "<not found>")
-    elseif (val AND NOT EXISTS ${val})
+    elseif (val AND NOT EXISTS "${val}")
      set (val "${val}  (does not exist)")
    else()
      set(some_files TRUE)