Commit bf9bd59c013ec9c2f799421ec1a410c5d35b8c38
2015-06-29T22:24:00
Fixed bug 2464 - Configure a sdl2-config.cmake.in together with sdl2.pc.in Leonardo Despite having a CMakeLists.txt file, SDL2 seems to be mainly built using the autotools system by package-managers. It is nice to have it but it is only useful if you are building SDL2 by yourself. People that want to use CMake to find their already-installed SDL2 are using a FindSDL2.cmake module based on the old FindSDL.cmake. This is not deprecated but it is discouraged by the CMake devs (see http://www.cmake.org/Bug/view.php?id=14826), as these modules needs maintainers to be included in the official CMake installation. To fix that, SDL and its accompanying libraries could configure a simple sdl2-config.cmake file, much like it does with sdl2.pc.in. We don't need to configure a full sdl2-config.cmake as in this post, http://forums.libsdl.org/viewtopic.php?t=10068&sid=ccf8abbf0d73fb03ae9cded991e60959 (because it depends on it being built with CMake). Using something as simple as http://www.cmake.org/Wiki/CMake/Tutorials/Packaging#Package_Configuration_Files is deemed enough. Here is another: http://quickgit.kde.org/?p=prison.git&a=blob&f=lib%2Fprison%2FPrisonConfig.cmake.in
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
diff --git a/Makefile.in b/Makefile.in
index ef63352..c647d5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,6 +176,8 @@ install-data:
$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
$(INSTALL) -m 644 sdl2.pc $(DESTDIR)$(libdir)/pkgconfig
+ $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/cmake/SDL2
+ $(INSTALL) -m 644 sdl2-config.cmake $(DESTDIR)$(libdir)/cmake/SDL2
uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data
uninstall-bin:
@@ -194,6 +196,7 @@ uninstall-lib:
uninstall-data:
rm -f $(DESTDIR)$(datadir)/aclocal/sdl2.m4
rm -f $(DESTDIR)$(libdir)/pkgconfig/sdl2.pc
+ rm -f $(DESTDIR)$(libdir)/cmake/SDL2/sdl2-config.cmake
clean:
rm -rf $(objects)
diff --git a/configure b/configure
index 50c4551..5d6f922 100755
--- a/configure
+++ b/configure
@@ -23764,7 +23764,7 @@ $SDLMAIN_DEPENDS
$SDLTEST_DEPENDS
__EOF__
-ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc"
+ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config sdl2-config.cmake SDL2.spec sdl2.pc"
ac_config_commands="$ac_config_commands sdl2_config"
@@ -24883,6 +24883,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;;
"sdl2-config") CONFIG_FILES="$CONFIG_FILES sdl2-config" ;;
+ "sdl2-config.cmake") CONFIG_FILES="$CONFIG_FILES sdl2-config.cmake" ;;
"SDL2.spec") CONFIG_FILES="$CONFIG_FILES SDL2.spec" ;;
"sdl2.pc") CONFIG_FILES="$CONFIG_FILES sdl2.pc" ;;
"sdl2_config") CONFIG_COMMANDS="$CONFIG_COMMANDS sdl2_config" ;;
diff --git a/configure.in b/configure.in
index 1339ea8..4e9cb96 100644
--- a/configure.in
+++ b/configure.in
@@ -3533,7 +3533,7 @@ $SDLTEST_DEPENDS
__EOF__
AC_CONFIG_FILES([
- Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc
+ Makefile:Makefile.in:Makefile.rules sdl2-config sdl2-config.cmake SDL2.spec sdl2.pc
])
AC_CONFIG_COMMANDS([sdl2_config],[chmod a+x sdl2-config])
diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in
new file mode 100644
index 0000000..c054767
--- /dev/null
+++ b/sdl2-config.cmake.in
@@ -0,0 +1,10 @@
+# sdl2 cmake project-config input for ./configure scripts
+
+set(prefix "@prefix@")
+set(exec_prefix "@exec_prefix@")
+set(libdir "@libdir")
+set(SDL2_PREFIX "@prefix@")
+set(SDL2_EXEC_PREFIX "@prefix@")
+set(SDL2_LIBDIR "@libdir@")
+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")