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

Fix exported osx framework config #2

Merged
merged 9 commits into from
May 31, 2021
Merged

Fix exported osx framework config #2

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
73714eb
Fix exported osx framework config
dg0yt May 16, 2021
3ffe3d1
Revise patterns
dg0yt May 16, 2021
1d85d58
Match line from keyword to newline
dg0yt May 16, 2021
da963a4
Fix usage of vcpkg_internal_get_cmake_vars
dg0yt May 19, 2021
6f629ad
Fix pattern matching
dg0yt May 19, 2021
f112ecf
Copy changes to vcpkg_fixup_cmake_targets.cmake
dg0yt May 19, 2021
d77688e
Use separate build dir for getting cmake vars
dg0yt May 19, 2021
17ab5e6
Use pristine get_cmake_vars
dg0yt May 19, 2021
d71129e
Fix variable name
dg0yt May 29, 2021
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
56 changes: 33 additions & 23 deletions ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,29 +229,39 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]]
endif()
foreach(targets_file IN LISTS targets_files)
file(READ "${targets_file}" targets_content)

string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*" library_contents "${targets_content}")
string(REGEX REPLACE
[[/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/[^/]+/System/Library/Frameworks/([_a-zA-Z]+)\.framework]]
[[-framework \1]]
fixed_contents
"${library_contents}"
)
string(REGEX REPLACE
[[/Library/Developer/CommandLineTools/SDKs/[^/]+/System/Library/Frameworks/([_a-zA-Z]+)\.framework]]
[[-framework \1]]
fixed_contents
"${fixed_contents}"
)
if (fixed_contents AND NOT fixed_contents STREQUAL library_contents)
string(REGEX REPLACE
"${library_contents}"
"${fixed_contents}"
targets_content
"${targets_content}"
)
endif()

string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*\n" library_contents "${targets_content}")
foreach(line IN LISTS library_contents)
set(fixed_line "${line}")
string(REGEX MATCHALL [[/[^ ;"]+/[^ ;"/]+\.framework]] frameworks "${line}")
foreach(framework IN LISTS frameworks)
if(NOT framework MATCHES [[^(.+)/(.+)\.framework$]])
continue()
endif()
set(path "${CMAKE_MATCH_1}")
set(name "${CMAKE_MATCH_2}")
if(NOT DEFINED VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES)
set(_saved_buildtrees_dir "${CURRENT_BUILDTREES_DIR}")
set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/get-cmake-vars")
vcpkg_internal_get_cmake_vars(
OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE
OPTIONS
-DVCPKG_LANGUAGES=CXX
-DVCPKG_VARS_TO_CHECK=CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
-DVCPKG_FLAGS_TO_CHECK=
-DVCPKG_ENV_VARS_TO_CHECK=
)
debug_message("Including cmake vars from: ${_VCPKG_CMAKE_VARS_FILE}")
include("${_VCPKG_CMAKE_VARS_FILE}")
set(VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES}" PARENT_SCOPE)
set(CURRENT_BUILDTREES_DIR "${_saved_buildtrees_dir}")
endif()
list(FIND VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${path}" index)
if(NOT index EQUAL -1)
string(REPLACE "${framework}" "-framework ${name}" fixed_line "${fixed_line}")
endif()
endforeach()
string(REPLACE "${line}" "${fixed_line}" targets_content "${targets_content}")
endforeach()
file(WRITE "${targets_file}" "${targets_content}")
endforeach()
endif()
Expand Down
55 changes: 33 additions & 22 deletions scripts/cmake/vcpkg_fixup_cmake_targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,28 +229,39 @@ function(vcpkg_fixup_cmake_targets)
endif()
foreach(targets_file IN LISTS targets_files)
file(READ "${targets_file}" targets_content)

string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*" library_contents "${targets_content}")
string(REGEX REPLACE
[[/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/[^/]+/System/Library/Frameworks/([_a-zA-Z]+)\.framework]]
[[-framework \1]]
fixed_contents
"${library_contents}"
)
string(REGEX REPLACE
[[/Library/Developer/CommandLineTools/SDKs/[^/]+/System/Library/Frameworks/([_a-zA-Z]+)\.framework]]
[[-framework \1]]
fixed_contents
"${fixed_contents}"
)
if (fixed_contents AND NOT fixed_contents STREQUAL library_contents)
string(REGEX REPLACE
"${library_contents}"
"${fixed_contents}"
targets_content
"${targets_content}"
)
endif()
string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*\n" library_contents "${targets_content}")
foreach(line IN LISTS library_contents)
set(fixed_line "${line}")
string(REGEX MATCHALL [[/[^ ;"]+/[^ ;"/]+\.framework]] frameworks "${line}")
foreach(framework IN LISTS frameworks)
if(NOT framework MATCHES [[^(.+)/(.+)\.framework$]])
continue()
endif()
set(path "${CMAKE_MATCH_1}")
set(name "${CMAKE_MATCH_2}")
if(NOT DEFINED VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES)
set(_saved_buildtrees_dir "${CURRENT_BUILDTREES_DIR}")
set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/get-cmake-vars")
vcpkg_internal_get_cmake_vars(
OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE
OPTIONS
-DVCPKG_LANGUAGES=CXX
-DVCPKG_VARS_TO_CHECK=CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
-DVCPKG_FLAGS_TO_CHECK=
-DVCPKG_ENV_VARS_TO_CHECK=
)
debug_message("Including cmake vars from: ${_VCPKG_CMAKE_VARS_FILE}")
include("${_VCPKG_CMAKE_VARS_FILE}")
set(VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES}" PARENT_SCOPE)
set(CURRENT_BUILDTREES_DIR "${_saved_buildtrees_dir}")
endif()
list(FIND VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${path}" index)
if(NOT index EQUAL -1)
string(REPLACE "${framework}" "-framework ${name}" fixed_line "${fixed_line}")
endif()
endforeach()
string(REPLACE "${line}" "${fixed_line}" targets_content "${targets_content}")
endforeach()
file(WRITE "${targets_file}" "${targets_content}")
endforeach()
endif()
Expand Down