Skip to content

[json-c] always install pc files #14086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 1 commit into from
Oct 16, 2020
Merged

[json-c] always install pc files #14086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/json-c/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: json-c
Version: 2019-09-10
Port-Version: 1
Description: A JSON implementation in C
Homepage: https://github.com/json-c/json-c
13 changes: 13 additions & 0 deletions ports/json-c/pkgconfig.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffb1db3dc..a82ed8619 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,7 +273,7 @@ install(
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)

-if (UNIX OR MINGW OR CYGWIN)
+if (1)
SET(prefix ${CMAKE_INSTALL_PREFIX})
# exec_prefix is prefix by default and CMake does not have the
# concept.
5 changes: 2 additions & 3 deletions ports/json-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO json-c/json-c
REF eae040a84a479ccad1d1c48314345c51ecf1a4a4
SHA512 18d8a31b341830b04676cad13fbc0608fb75a323522161ac8fd0bb5058db82c1c261d504696a1e12f4b03eb0967632885580ff81d808adf2f1dff7e32d131ba0
HEAD_REF master
PATCHES pkgconfig.patch
)

vcpkg_configure_cmake(
Expand All @@ -16,7 +15,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})

vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
Expand Down