[z3] Update to 4.8.6 (#8899)

* [z3]Upgrade to 4.8.6.

* [z3]Use `vcpkg_fail_port_install`.

3 files changed, 10 insertions, 77 deletions

diff --git a/ports/z3/CONTROL b/ports/z3/CONTROL
index 5a806da95..be11a9d7c 100644
--- a/ports/z3/CONTROL
+++ b/ports/z3/CONTROL
@@ -1,3 +1,4 @@
 Source: z3
-Version: 4.8.5-1
-Description: An SMT solver
+Version: 4.8.6
+Homepage: https://github.com/Z3Prover/z3
+Description: Z3 is a theorem prover from Microsoft Research.
\ No newline at end of file
diff --git a/ports/z3/fix-install-path.patch b/ports/z3/fix-install-path.patch
index 170ca085a..48ff2a8d8 100644
--- a/ports/z3/fix-install-path.patch
+++ b/ports/z3/fix-install-path.patch
@@ -1,39 +1,5 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e73daf63..c6bca7918 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -615,7 +615,7 @@ install(EXPORT
-   Z3_EXPORTED_TARGETS
-   FILE "Z3Targets.cmake"
-   NAMESPACE z3::
--  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"
-+  DESTINATION share/z3
- )
- set(Z3_INSTALL_TREE_CMAKE_CONFIG_FILE "${PROJECT_BINARY_DIR}/cmake/Z3Config.cmake")
- set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
-@@ -640,7 +640,7 @@ unset(CONFIG_FILE_TYPE)
- # Add install rule to install ${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}
- install(
-   FILES "${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}"
--  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"
-+  DESTINATION share/z3
- )
- 
- # TODO: Provide a `Z3Version.cmake` file so that clients can specify the version
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index d5778add9..35b7e4c55 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -88,6 +88,6 @@ set(CMAKE_INSTALL_API_BINDINGS_DOC
- if (INSTALL_API_BINDINGS_DOCUMENTATION)
-   install(
-     DIRECTORY "${DOC_DEST_DIR}"
--    DESTINATION "${CMAKE_INSTALL_API_BINDINGS_DOC}"
-+    DESTINATION share/z3
-   )
- endif()
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9b6f00b62..8b47125d3 100644
+index 9b6f00b..8b47125 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -173,7 +173,8 @@ install(TARGETS libz3
@@ -46,34 +12,8 @@ index 9b6f00b62..8b47125d3 100644
    PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
  )
  
-diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt
-index f593d91a4..70682b721 100644
---- a/src/api/java/CMakeLists.txt
-+++ b/src/api/java/CMakeLists.txt
-@@ -228,7 +228,7 @@ if (INSTALL_JAVA_BINDINGS)
-     PATH
-     "Directory to install Z3 Java JNI bridge library relative to install prefix"
-   )
--  install(TARGETS z3java DESTINATION "${Z3_JAVA_JNI_LIB_INSTALLDIR}")
-+  install(TARGETS z3java DESTINATION share/z3)
-   # Note: Don't use ``DESTINATION`` here as the version of ``UseJava.cmake`` shipped
-   # with CMake 2.8.12.2 handles that incorrectly.
-   install_jar(z3JavaJar "${Z3_JAVA_JAR_INSTALLDIR}")
-diff --git a/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt
-index 6cabb779a..0b79861bf 100644
---- a/src/api/python/CMakeLists.txt
-+++ b/src/api/python/CMakeLists.txt
-@@ -136,7 +136,7 @@ if (INSTALL_PYTHON_BINDINGS)
-   # Using DESTDIR still seems to work even if we use an absolute path
-   message(STATUS "Python bindings will be installed to \"${CMAKE_INSTALL_PYTHON_PKG_DIR}\"")
-   install(FILES ${build_z3_python_bindings_target_depends}
--    DESTINATION "${CMAKE_INSTALL_PYTHON_PKG_DIR}/z3"
-+    DESTINATION share/z3
-   )
- else()
-   message(STATUS "Not emitting rules to install Z3 python bindings")
 diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
-index 278246341..b6cd2f1c1 100644
+index 2782463..b6cd2f1 100644
 --- a/src/shell/CMakeLists.txt
 +++ b/src/shell/CMakeLists.txt
 @@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS})
diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake
index e3adeabb0..b6c46ad01 100644
--- a/ports/z3/portfile.cmake
+++ b/ports/z3/portfile.cmake
@@ -1,12 +1,4 @@
-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-  message(FATAL_ERROR "Z3 doesn't currently support ARM64")
-endif()
-
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  message(FATAL_ERROR "Z3 doesn't currently support UWP")
-endif()
-
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm64")
 
 vcpkg_find_acquire_program(PYTHON2)
 get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
@@ -15,8 +7,8 @@ vcpkg_add_to_path("${PYTHON2_DIR}")
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Z3Prover/z3
-  REF Z3-4.8.5
-  SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
+  REF 78ed71b8de7d4d089f2799bf2d06f411ac6b9062 # z3-4.8.6
+  SHA512 3505a2e3c634ea5369456b857665d9de538be631f7ce9b2eb84ef318081bffb286186abc98f7bcbf615c0396081aebc65ebc5f20135cd2b97c5228452550ffa4
   HEAD_REF master
   PATCHES
          fix-install-path.patch
@@ -34,9 +26,9 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/z3 TARGET_PATH share/Z3)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/z3 RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)