Skip to content
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

Jump to bottom

[scripts] add new function vcpkg_fixup_pkgconfig #9861

Merged
merged 12 commits into from
Apr 28, 2020
Merged

[scripts] add new function vcpkg_fixup_pkgconfig #9861

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df57a82
add new function vcpkg_fixup_pkgconfig
Neumann-A Jan 31, 2020
8c89d6e
make message with changed files a debug_message
Neumann-A Jan 31, 2020
fd3d35d
add two more cases to the debug *.pc files
Neumann-A Feb 4, 2020
1b1d944
comment out prefix.
Neumann-A Feb 5, 2020
d7e2962
changed the comment header.
Neumann-A Feb 7, 2020
f4bfe74
add missing word
Neumann-A Feb 7, 2020
982c921
Merge branch 'master' into add_vcpkg_fixup_pkgconfig
Neumann-A Mar 12, 2020
3e0dd50
finish vcpkg_fixup_pkgconfig.cmake
Neumann-A Mar 12, 2020
a3d4a0b
Update vcpkg_fixup_pkgconfig.cmake
Neumann-A Mar 20, 2020
efbf912
transfer changes from x windows pr
Neumann-A Mar 25, 2020
a7c6c6c
fix typo in regex
Neumann-A Mar 26, 2020
c21893a
make the regex comment aware
Neumann-A Apr 9, 2020
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 scripts/cmake/vcpkg_common_functions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ include(vcpkg_execute_build_process)
include(vcpkg_fail_port_install)
include(vcpkg_find_acquire_program)
include(vcpkg_fixup_cmake_targets)
include(vcpkg_fixup_pkgconfig)
include(vcpkg_from_github)
include(vcpkg_from_gitlab)
include(vcpkg_from_bitbucket)
Expand Down
49 changes: 49 additions & 0 deletions scripts/cmake/vcpkg_fixup_pkgconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#.rst:
# .. command:: vcpkg_fixup_pkgconfig
#
# Tries to fix the paths found in *.pc files

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a note: we use a different comment style, which is extracted into .md files via docs/regenerate.ps1. See some other helpers like vcpkg_configure_cmake() for examples.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed but still not sure if its 100% correct.

function(vcpkg_fixup_pkgconfig)
cmake_parse_arguments(_vfpkg "" "" "RELEASE_FILES;DEBUG_FILES" ${ARGN})

message(STATUS "Fixing pkgconfig")
if(_vfpkg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "vcpkg_fixup_pkgconfig was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}")
endif()

if(NOT _vfpkg_RELEASE_FILES)
file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc")
list(FILTER _vfpkg_RELEASE_FILES EXCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/")
endif()

if(NOT _vfpkg_DEBUG_FILES)
file(GLOB_RECURSE _vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc")
list(FILTER _vfpkg_DEBUG_FILES INCLUDE REGEX "${CURRENT_PACKAGES_DIR}/debug/")
endif()

message(STATUS "Fixing pkgconfig - release")
message(STATUS "Files: ${_vfpkg_RELEASE_FILES}")
vicroms marked this conversation as resolved.
Show resolved Hide resolved
foreach(_file ${_vfpkg_RELEASE_FILES})
file(READ "${_file}" _contents)
string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}")
string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}")
string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}")
vicroms marked this conversation as resolved.
Show resolved Hide resolved
file(WRITE "${_file}" "${_contents}")
endforeach()

message(STATUS "Fixing pkgconfig - debug")
message(STATUS "Files: ${_vfpkg_DEBUG_FILES}")
foreach(_file ${_vfpkg_DEBUG_FILES})
file(READ "${_file}" _contents)
string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}")
string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}")
string(REPLACE "debug/include" "../include" _contents "${_contents}")
string(REPLACE "debug/share" "../share" _contents "${_contents}")
string(REPLACE "debug/lib" "lib" _contents "${_contents}") # the prefix will contain the debug keyword
string(REGEX REPLACE "^prefix=\\\${prefix}" "prefix=${CURRENT_INSTALLED_DIR}" _contents "${_contents}")
file(WRITE "${_file}" "${_contents}")
endforeach()
message(STATUS "Fixing pkgconfig --- finished")
endfunction()