Browse Source

pkg-config: Empty Requires.private on shared-only build

If user doesn't build the static library,
`pkg-config --static --libs raylib` should be equivalent to
`pkg-config --libs raylib`.
pull/465/head
Ahmad Fatoum 6 years ago
parent
commit
1be72a2e72
No known key found for this signature in database GPG Key ID: C3EAC3DE9321D59B
3 changed files with 7 additions and 5 deletions
  1. +1
    -1
      raylib.pc.in
  2. +3
    -1
      src/CMakeLists.txt
  3. +3
    -3
      utils.cmake

+ 1
- 1
raylib.pc.in View File

@ -8,6 +8,6 @@ Description: Simple and easy-to-use library to learn videogames programming
URL: http://github.com/raysan5/raylib
Version: @PROJECT_VERSION@
Libs: -L${libdir} -lraylib
Libs.private:@PKG_CONFIG_LIBS_PRIVATE@
Libs.private: @PKG_CONFIG_LIBS_PRIVATE@
Requires.private:
Cflags: -I${includedir}

+ 3
- 1
src/CMakeLists.txt View File

@ -137,6 +137,8 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
PUBLIC ${GRAPHICS}
)
set(PKG_CONFIG_LIBS_PRIVATE ${__PKG_CONFIG_LIBS_PRIVATE})
if (WITH_PIC)
set_property(TARGET ${RAYLIB} PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()
@ -149,7 +151,7 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
configure_file(../raylib.pc.in raylib.pc @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/release/raylib.pc DESTINATION lib/pkgconfig)
# Copy the header files to the build directory
file(COPY "raylib.h" DESTINATION ".")
file(COPY "rlgl.h" DESTINATION ".")

+ 3
- 3
utils.cmake View File

@ -74,8 +74,8 @@ foreach(L ${LIBS_PRIVATE})
set(LASTDIR ${DIR})
set(PKG_CONFIG_LIBS_PRIVATE ${PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT})
string (REPLACE ";" " " PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE}")
set(__PKG_CONFIG_LIBS_PRIVATE ${__PKG_CONFIG_LIBS_PRIVATE} ${DIR_OPT} ${FILE_OPT})
string (REPLACE ";" " " __PKG_CONFIG_LIBS_PRIVATE "${__PKG_CONFIG_LIBS_PRIVATE}")
endforeach(L)
@ -86,7 +86,7 @@ function(link_libraries_to_executable executable)
if (TARGET raylib_shared)
target_link_libraries(${executable} raylib_shared)
else()
target_link_libraries(${executable} raylib ${PKG_CONFIG_LIBS_PRIVATE})
target_link_libraries(${executable} raylib ${__PKG_CONFIG_LIBS_PRIVATE})
endif()
endfunction()

Loading…
Cancel
Save