From 9560abcb79f1a9cdf2edf4188d455beb7d269460 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Tue, 19 Feb 2019 21:31:19 +0800 Subject: [PATCH 1/4] respect libsuffix in pkgconfig discovered in https://bugs.gentoo.org/677946 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e57996cc66..3d4ee9f5dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -629,5 +629,5 @@ add_executable(cstool ${CSTOOL_SRC}) target_link_libraries(cstool ${default-target}) install(TARGETS cstool DESTINATION bin) -install(FILES ${CMAKE_BINARY_DIR}/capstone.pc DESTINATION lib/pkgconfig) +install(FILES ${CMAKE_BINARY_DIR}/capstone.pc DESTINATION lib{LIBSUFFIX}/pkgconfig) endif () From 962d5fdc608f3ce90e337bc91688eedffd3c4651 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Tue, 19 Feb 2019 22:02:28 +0800 Subject: [PATCH 2/4] Update CMakeLists.txt --- CMakeLists.txt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d4ee9f5dd..b94de28430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -594,15 +594,9 @@ source_group("Include\\EVM" FILES ${HEADERS_EVM}) source_group("Include\\MOS65XX" FILES ${HEADERS_MOS65XX}) ### test library 64bit routine: -get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) +include("GNUInstallDirs") -if (NOT APPLE AND "${LIB64}" STREQUAL "TRUE") - set(LIBSUFFIX 64) -else() - set(LIBSUFFIX "") -endif() - -set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") +set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") mark_as_advanced(INSTALL_LIB_DIR) ## installation @@ -629,5 +623,5 @@ add_executable(cstool ${CSTOOL_SRC}) target_link_libraries(cstool ${default-target}) install(TARGETS cstool DESTINATION bin) -install(FILES ${CMAKE_BINARY_DIR}/capstone.pc DESTINATION lib{LIBSUFFIX}/pkgconfig) +install(FILES ${CMAKE_BINARY_DIR}/capstone.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif () From 79770f58120efb482d1975357ad1bb75151f3a53 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Tue, 19 Feb 2019 22:19:13 +0800 Subject: [PATCH 3/4] Update CMakeLists.txt --- CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b94de28430..8a8ace6a6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -596,9 +596,6 @@ source_group("Include\\MOS65XX" FILES ${HEADERS_MOS65XX}) ### test library 64bit routine: include("GNUInstallDirs") -set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") -mark_as_advanced(INSTALL_LIB_DIR) - ## installation install(FILES ${HEADERS_COMMON} DESTINATION include/capstone) configure_file(capstone.pc.in ${CMAKE_BINARY_DIR}/capstone.pc @ONLY) @@ -606,15 +603,15 @@ configure_file(capstone.pc.in ${CMAKE_BINARY_DIR}/capstone.pc @ONLY) if (CAPSTONE_BUILD_STATIC) install(TARGETS capstone-static RUNTIME DESTINATION bin - LIBRARY DESTINATION ${INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} endif () if (CAPSTONE_BUILD_SHARED) install(TARGETS capstone-shared RUNTIME DESTINATION bin - LIBRARY DESTINATION ${INSTALL_LIB_DIR} - ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} endif () if (CAPSTONE_BUILD_SHARED AND CAPSTONE_BUILD_CSTOOL) From 9d01d8aac84bf6c474d79306932e768810d2f73d Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Tue, 19 Feb 2019 22:24:48 +0800 Subject: [PATCH 4/4] Update CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a8ace6a6f..ac18440654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -604,14 +604,14 @@ if (CAPSTONE_BUILD_STATIC) install(TARGETS capstone-static RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif () if (CAPSTONE_BUILD_SHARED) install(TARGETS capstone-shared RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif () if (CAPSTONE_BUILD_SHARED AND CAPSTONE_BUILD_CSTOOL)