Merge pull request #7323 from EOSIO/zach-cdt-fixes

Look in both lib and lib64 for CMake modules when building EOSIO Tester

CMakeModules/EosioTester.cmake.in

@@ -44,28 +44,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