mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-31 05:03:22 +08:00
937fc9ed70
* [triton] Fix usage * version * [triton] Revert unneeded changes Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a8bbe47..966ded8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -99,9 +99,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/")
|
|
# Find Z3
|
|
if(Z3_INTERFACE)
|
|
message(STATUS "Compiling with Z3 SMT solver")
|
|
- find_package(Z3 REQUIRED)
|
|
- include_directories(${Z3_INCLUDE_DIRS})
|
|
+ find_package(Z3 CONFIG REQUIRED)
|
|
set(TRITON_Z3_INTERFACE ON)
|
|
+ set(Z3_LIBRARIES z3::libz3)
|
|
endif()
|
|
|
|
# Find bitwuzla
|
|
diff --git a/CMakeModules/FindCAPSTONE.cmake b/CMakeModules/FindCAPSTONE.cmake
|
|
index ff2c63f..4dcf9af 100644
|
|
--- a/CMakeModules/FindCAPSTONE.cmake
|
|
+++ b/CMakeModules/FindCAPSTONE.cmake
|
|
@@ -26,9 +26,11 @@ if(NOT CAPSTONE_INCLUDE_DIRS AND NOT CAPSTONE_LIBRARIES)
|
|
NAMES capstone/capstone.h
|
|
PATHS ${CAPSTONE_PKGCONF_INCLUDE_DIRS}
|
|
)
|
|
+
|
|
+ string(APPEND CAPSTONE_INCLUDE_DIR "/capstone")
|
|
|
|
find_library(CAPSTONE_LIBRARY
|
|
- NAMES capstone
|
|
+ NAMES capstone capstone_dll
|
|
PATHS ${CAPSTONE_PKGCONF_LIBRARY_DIRS}
|
|
)
|
|
|
|
diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in
|
|
index 94c58bc..115d697 100644
|
|
--- a/src/libtriton/Config.cmake.in
|
|
+++ b/src/libtriton/Config.cmake.in
|
|
@@ -40,10 +40,6 @@ if (TRITON_LLVM_INTERFACE)
|
|
include_directories("@LLVM_INCLUDE_DIRS@")
|
|
endif()
|
|
|
|
-# Z3 include directories
|
|
-if (TRITON_Z3_INTERFACE)
|
|
- include_directories("@Z3_INCLUDE_DIRS@")
|
|
-endif()
|
|
|
|
# Bitwuzla include directories
|
|
if (TRITON_BITWUZLA_INTERFACE)
|