diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-08-21 05:46:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 14:46:02 -0700 |
| commit | 025e564979cc01d0fbc5c920aa8a36635efb01bb (patch) | |
| tree | a2536220952a57e01494fa8b8764b1ac0a0be362 /ports | |
| parent | 6aa310ae75ad9b383b58f3483faa303d46c89ed0 (diff) | |
| download | vcpkg-025e564979cc01d0fbc5c920aa8a36635efb01bb.tar.gz vcpkg-025e564979cc01d0fbc5c920aa8a36635efb01bb.zip | |
[vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469 (#19633)
* [vcpkg_cmake_config_fixup] Revert #19469
* Update the version date
* actually just revert
* move stuff around in vcpkg-cmake-config.json file
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg.json | 3 | ||||
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake | 40 |
2 files changed, 4 insertions, 39 deletions
diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 71d81f250..49faaf4d4 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-08-11" + "version-date": "2021-05-22", + "port-version": 1 } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index 3cb60fe6b..a145d324a 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -221,44 +221,6 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(WRITE "${main_cmake}" "${contents}") endforeach() - if (VCPKG_TARGET_IS_OSX) - # see #16259 for details why this replacement is necessary. - file(GLOB targets_files "${release_share}/*[Tt]argets.cmake") - if (targets_files STREQUAL "") - file(GLOB targets_files "${release_share}/*[Cc]onfig.cmake") - endif() - foreach(targets_file IN LISTS targets_files) - file(READ "${targets_file}" targets_content) - 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") - z_vcpkg_get_cmake_vars(cmake_vars_file) - debug_message("Including cmake vars from: ${cmake_vars_file}") - include("${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() - # Remove /debug/<target_path>/ if it's empty. file(GLOB_RECURSE remaining_files "${debug_share}/*") if(remaining_files STREQUAL "") @@ -271,3 +233,5 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() endfunction() + + |