diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c3c9a2..e9f2e2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,6 +230,7 @@ if(SDL2PP_STANDALONE) # pkgconfig module configure_file(sdl2pp.pc.in sdl2pp.pc @ONLY) + configure_file(SDL2ppConfig.cmake.in SDL2ppConfig.cmake @ONLY) # install set(PKGCONFIGDIR lib/pkgconfig CACHE STRING "directory where to install pkg-config files") @@ -252,5 +253,13 @@ if(SDL2PP_STANDALONE) ) install(FILES ${PROJECT_BINARY_DIR}/sdl2pp.pc DESTINATION ${PKGCONFIGDIR}) - install(EXPORT SDL2pp NAMESPACE SDL2pp:: DESTINATION lib/cmake/SDL2pp FILE SDL2ppConfig.cmake) + install(EXPORT SDL2pp NAMESPACE SDL2pp:: DESTINATION lib/cmake/SDL2pp FILE SDL2ppTargets.cmake) + install(FILES + ${PROJECT_BINARY_DIR}/SDL2ppConfig.cmake + cmake/FindSDL2.cmake + cmake/FindSDL2_image.cmake + cmake/FindSDL2_ttf.cmake + cmake/FindSDL2_mixer.cmake + DESTINATION lib/cmake/SDL2pp + ) endif() diff --git a/SDL2ppConfig.cmake.in b/SDL2ppConfig.cmake.in new file mode 100644 index 0000000..5a2e400 --- /dev/null +++ b/SDL2ppConfig.cmake.in @@ -0,0 +1,15 @@ +include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2.cmake") + +if(@SDL2PP_WITH_IMAGE@) + include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2_image.cmake") +endif() + +if(@SDL2PP_WITH_TTF@) + include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2_ttf.cmake") +endif() + +if(@SDL2PP_WITH_MIXER@) + include("${CMAKE_CURRENT_LIST_DIR}/FindSDL2_mixer.cmake") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/SDL2ppTargets.cmake") diff --git a/exttests/pkg-config/Makefile b/exttests/pkg-config/Makefile index 3ed5997..eedbcb6 100644 --- a/exttests/pkg-config/Makefile +++ b/exttests/pkg-config/Makefile @@ -5,6 +5,4 @@ CXXFLAGS+= -std=c++11 all: make-ext-test make-ext-test: - @echo "SDL2PP_CFLAGS=${SDL2PP_CFLAGS}" - @echo "SDL2PP_LIBS=${SDL2PP_LIBS}" ${CXX} -o make-ext-test ../../examples/sprites.cc ${CXXFLAGS} `pkg-config --cflags --libs sdl2pp`