[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>

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
 }

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()
+
+

scripts/cmake/vcpkg_fixup_cmake_targets.cmake

@@ -220,44 +220,6 @@ function(vcpkg_fixup_cmake_targets)
         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(NOT REMAINING_FILES)
@@ -279,3 +241,5 @@ function(vcpkg_fixup_cmake_targets)
         file(WRITE ${CMAKE_FILE} "${_contents}")
     endforeach()
 endfunction()
+
+

versions/baseline.json

@@ -6621,8 +6621,8 @@
       "port-version": 0
     },
     "vcpkg-cmake-config": {
-      "baseline": "2021-08-11",
+      "baseline": "2021-05-22",
-      "port-version": 0
+      "port-version": 1
     },
     "vcpkg-gfortran": {
       "baseline": "3",

versions/v-/vcpkg-cmake-config.json

@@ -1,15 +1,15 @@
 {
   "versions": [
-    {
-      "git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee",
-      "version-date": "2021-08-11",
-      "port-version": 0
-    },
     {
       "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5",
       "version-date": "2021-05-22",
       "port-version": 1
     },
+    {
+      "git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee",
+      "version-date": "2021-08-11",
+      "port-version": 0
+    },
     {
       "git-tree": "2d4f997a32b8e8bfe98d12beb2bfe6be713c7086",
       "version-date": "2021-05-22",