[z3] update port to 4.8.8 (#11314)

* [z3] update port to 4.8.8

* update port file with new cmake var name, Z3_BUILD_LIBZ3_SHARED

3 files changed, 27 insertions, 29 deletions

diff --git a/ports/z3/CONTROL b/ports/z3/CONTROL
index 866f2cf5f..5f314a63d 100644
--- a/ports/z3/CONTROL
+++ b/ports/z3/CONTROL
@@ -1,5 +1,5 @@
 Source: z3
-Version: 4.8.6
+Version: 4.8.8
 Homepage: https://github.com/Z3Prover/z3
 Description: Z3 is a theorem prover from Microsoft Research.
 Supports: !arm64 && !uwp
diff --git a/ports/z3/fix-install-path.patch b/ports/z3/fix-install-path.patch
index 48ff2a8d8..cb21e1360 100644
--- a/ports/z3/fix-install-path.patch
+++ b/ports/z3/fix-install-path.patch
@@ -1,25 +1,23 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9b6f00b..8b47125 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -173,7 +173,8 @@ install(TARGETS libz3
-   EXPORT Z3_EXPORTED_TARGETS
-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed?
--  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" # For Windows. DLLs are runtime targets for CMake
-+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake
-+  BUNDLE  DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX.
-   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
- )
- 
-diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
-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})
- z3_add_component_dependencies_to_target(shell ${shell_expanded_deps})
- z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
- install(TARGETS shell
--  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+  RUNTIME DESTINATION tools/z3
- )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

+index e8de0c7e4..064c18eab 100644

+--- a/src/CMakeLists.txt

++++ b/src/CMakeLists.txt

+@@ -173,6 +173,7 @@ install(TARGETS libz3

+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed?

+   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake

++  BUNDLE  DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX.

+   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"

+ )

+ 

+diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt

+index 278246341..b6cd2f1c1 100644

+--- a/src/shell/CMakeLists.txt

++++ b/src/shell/CMakeLists.txt

+@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS})

+ z3_add_component_dependencies_to_target(shell ${shell_expanded_deps})

+ z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})

+ install(TARGETS shell

+-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

++  RUNTIME DESTINATION tools/z3

+ )

diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake
index b6c46ad01..a7b029724 100644
--- a/ports/z3/portfile.cmake
+++ b/ports/z3/portfile.cmake
@@ -7,15 +7,15 @@ vcpkg_add_to_path("${PYTHON2_DIR}")
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Z3Prover/z3
-  REF 78ed71b8de7d4d089f2799bf2d06f411ac6b9062 # z3-4.8.6
-  SHA512 3505a2e3c634ea5369456b857665d9de538be631f7ce9b2eb84ef318081bffb286186abc98f7bcbf615c0396081aebc65ebc5f20135cd2b97c5228452550ffa4
+  REF ad55a1f1c617a7f0c3dd735c0780fc758424c7f1 # z3-4.8.8
+  SHA512 e9ee645e0a70e1884c3c7745c3c95445d009557f2f06d018a0368274758dedfd94960093b9ee9332212eb29d05aca76137e8ac61365ae0deb5c12fefbe2feee1
   HEAD_REF master
   PATCHES
          fix-install-path.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-  set(BUILD_STATIC "-DBUILD_LIBZ3_SHARED=OFF")
+  set(BUILD_STATIC "-DZ3_BUILD_LIBZ3_SHARED=OFF")
 endif()
 
 vcpkg_configure_cmake(