LLVM: Use find_dependency and fix Z3 finding (#942)

* LLVM: Use find_dependency and fix Z3 finding

* Bump port-version

Author: ekilmer

ports/llvm-13/0021-fix-find_dependency.patch

@@ -0,0 +1,28 @@
+diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
+index 60b56b5152ea..09d78a0a2466 100644
+--- a/llvm/cmake/modules/LLVMConfig.cmake.in
++++ b/llvm/cmake/modules/LLVMConfig.cmake.in
+@@ -56,17 +56,21 @@ set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
+ 
+ set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
+ 
++include(CMakeFindDependencyMacro)
+ set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@)
+ if(LLVM_ENABLE_ZLIB)
+-  find_package(ZLIB)
++  find_dependency(ZLIB)
+ endif()
+ 
+ set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@)
+ if(LLVM_ENABLE_LIBXML2)
+-  find_package(LibXml2)
++  find_dependency(LibXml2)
+ endif()
+ 
+ set(LLVM_WITH_Z3 @LLVM_WITH_Z3@)
++if(LLVM_WITH_Z3)
++  find_dependency(Z3 4.7.1)
++endif()
+ 
+ set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@)
+ 

ports/llvm-13/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "llvm-13",
   "version": "13.0.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp & !(arm & windows)",

ports/llvm-14/0021-fix-find_dependency.patch

@@ -0,0 +1,29 @@
+diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
+index e1540ff316f7..9c8239094aca 100644
+--- a/llvm/cmake/modules/LLVMConfig.cmake.in
++++ b/llvm/cmake/modules/LLVMConfig.cmake.in
+@@ -67,18 +67,22 @@ set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
+ 
+ set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
+ 
++include(CMakeFindDependencyMacro)
+ set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@)
+ if(LLVM_ENABLE_ZLIB)
+-  set(ZLIB_ROOT @ZLIB_ROOT@)
++  find_dependency(ZLIB)
+   find_package(ZLIB)
+ endif()
+ 
+ set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@)
+ if(LLVM_ENABLE_LIBXML2)
+-  find_package(LibXml2)
++  find_dependency(LibXml2)
+ endif()
+ 
+ set(LLVM_WITH_Z3 @LLVM_WITH_Z3@)
++if(LLVM_WITH_Z3)
++  find_dependency(Z3 4.7.1)
++endif()
+ 
+ set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@)
+ 

ports/llvm-14/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "llvm-14",
   "version": "14.0.3",
+  "port-version": 1,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp & !(arm & windows)",