diff --git a/CMakeLists.txt b/CMakeLists.txt index c7645b9..23f9deb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,11 +30,13 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) FIND_PACKAGE(SDL2 REQUIRED) SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) SET(SDL2_ALL_LIBRARIES ${SDL2_LIBRARY}) +SET(SDL2_ALL_PKGCONFIG_MODULES sdl2) IF(SDL2PP_WITH_IMAGE) FIND_PACKAGE(SDL2_image REQUIRED) SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR}) SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_IMAGE_LIBRARY}) + SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image") ELSE(SDL2PP_WITH_IMAGE) MESSAGE(STATUS "SDL2_image support disabled") ENDIF(SDL2PP_WITH_IMAGE) @@ -43,6 +45,7 @@ IF(SDL2PP_WITH_TTF) FIND_PACKAGE(SDL2_ttf REQUIRED) SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIR}) SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_TTF_LIBRARY}) + SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") ELSE(SDL2PP_WITH_TTF) MESSAGE(STATUS "SDL2_ttf support disabled") ENDIF(SDL2PP_WITH_TTF) @@ -51,6 +54,7 @@ IF(SDL2PP_WITH_MIXER) FIND_PACKAGE(SDL2_mixer REQUIRED) SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR}) SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_MIXER_LIBRARY}) + SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer") ELSE(SDL2PP_WITH_MIXER) MESSAGE(STATUS "SDL2_mixer support disabled") ENDIF(SDL2PP_WITH_MIXER) @@ -241,7 +245,7 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) SET(SDL2_PKGCONFIG_CFLAGS "${SDL2_PKGCONFIG_CFLAGS} -I${INCDIR}") ENDFOREACH(INCDIR IN SDL2_ALL_INCLUDE_DIRS) - SET(SDL2_PKGCONFIG_LIBS "") + SET(SDL2_PKGCONFIG_LIBS "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2pp${CMAKE_SHARED_LIBRARY_SUFFIX}") FOREACH(LIB IN LISTS SDL2_ALL_LIBRARIES) SET(SDL2_PKGCONFIG_LIBS "${SDL2_PKGCONFIG_LIBS} ${LIB}") ENDFOREACH(LIB IN SDL2_LIBRARIES) diff --git a/sdl2pp.pc.in b/sdl2pp.pc.in index f8ee83c..1915aa4 100644 --- a/sdl2pp.pc.in +++ b/sdl2pp.pc.in @@ -6,7 +6,7 @@ includedir=${prefix}/include Name: sdl2pp Description: C++11 bindings/wrappers for SDL2 Version: @SDL2PP_VERSION@ -Requires: +Requires: @SDL2_ALL_PKGCONFIG_MODULES@ Conflicts: -Libs: -L${libdir} -lSDL2pp@SDL2_PKGCONFIG_LIBS@ -Cflags: -I${includedir}@SDL2_PKGCONFIG_CFLAGS@ +Libs: -L${libdir} -lSDL2pp +Cflags: -I${includedir}