From 7cd1f092dc163a91292aaf3bfd81482384fb69c2 Mon Sep 17 00:00:00 2001 From: Fernando Lopez Jr Date: Mon, 17 Jul 2017 08:53:03 +0100 Subject: system/capstone: Updated for version 4.0_alpha5. Signed-off-by: David Spencer --- system/capstone/CMakeLists.txt.patch | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 system/capstone/CMakeLists.txt.patch (limited to 'system/capstone/CMakeLists.txt.patch') diff --git a/system/capstone/CMakeLists.txt.patch b/system/capstone/CMakeLists.txt.patch new file mode 100644 index 0000000000..123c94bd83 --- /dev/null +++ b/system/capstone/CMakeLists.txt.patch @@ -0,0 +1,41 @@ +--- CMakeLists.txt 2017-04-17 07:31:11.000000000 -0600 ++++ CMakeLists_new.txt 2017-07-16 19:39:43.597509953 -0600 +@@ -460,21 +460,34 @@ + source_group("Include\\M68K" FILES ${HEADERS_M68K}) + source_group("Include\\TMS320C64x" FILES ${HEADERS_TMS320C64X}) + ++### test library 64bit routine: ++get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) ++ ++if ("${LIB64}" STREQUAL "TRUE") ++ set(LIBSUFFIX 64) ++else() ++ set(LIBSUFFIX "") ++endif() ++ ++set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") ++mark_as_advanced(INSTALL_LIB_DIR) ++ ++ + ## installation + install(FILES ${HEADERS_COMMON} DESTINATION include/capstone) + + if (CAPSTONE_BUILD_STATIC) + install(TARGETS capstone-static + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION ${INSTALL_LIB_DIR} ++ ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) + endif () + + if (CAPSTONE_BUILD_SHARED) + install(TARGETS capstone-shared + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION ${INSTALL_LIB_DIR} ++ ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) + endif () + + if (CAPSTONE_BUILD_SHARED) -- cgit v1.2.3