From 0de47df43ea6af8536a904fc4e17cba496df5870 Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Fri, 10 May 2019 17:19:02 -0400 Subject: [PATCH] Look in both lib and lib64 for CMake modules when building EOSIO Tester --- CMakeModules/EosioTester.cmake.in | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in index 4dfc2f60451..e938378ed93 100644 --- a/CMakeModules/EosioTester.cmake.in +++ b/CMakeModules/EosioTester.cmake.in @@ -43,28 +43,28 @@ find_package(Boost 1.67 REQUIRED COMPONENTS iostreams unit_test_framework) -find_library(libtester eosio_testing @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libchain eosio_chain @CMAKE_INSTALL_FULL_LIBDIR@) +find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) - find_library(libfc fc_debug @CMAKE_INSTALL_FULL_LIBDIR@) - find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_FULL_LIBDIR@) + find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) + find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) else() - find_library(libfc fc @CMAKE_INSTALL_FULL_LIBDIR@) - find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_FULL_LIBDIR@) + find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) + find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) endif() -find_library(libwasm WASM @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libwast WAST @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libwabt wabt @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libir IR @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libplatform Platform @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(liblogging Logging @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libruntime Runtime @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libsoftfloat softfloat @CMAKE_INSTALL_FULL_LIBDIR@) +find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libir IR @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib) find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib) -find_library(libchainbase chainbase @CMAKE_INSTALL_FULL_LIBDIR@) -find_library(libbuiltins builtins @CMAKE_INSTALL_FULL_LIBDIR@) +find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir HINTS ENV GMP_LIB_DIR ENV GMP_DIR