From a6d058abf6f65da65585e69e9144349609639220 Mon Sep 17 00:00:00 2001 From: huangwei5 Date: Wed, 7 Nov 2018 10:09:57 +0800 Subject: [PATCH 1/2] scripts: if 64-bit, find_library() should search the lib64 --- bin/dsn.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/dsn.cmake b/bin/dsn.cmake index a25f8b435d..99091260fe 100644 --- a/bin/dsn.cmake +++ b/bin/dsn.cmake @@ -269,6 +269,11 @@ endmacro(ms_setup_boost) function(dsn_setup_system_libs) find_package(Threads REQUIRED) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON) + message("set FIND_LIBRARY_USE_LIB64_PATHS ON") + endif() + set(DSN_SYSTEM_LIBS "") find_library(DSN_LIB_RT NAMES rt) From 91e575f0eb5e2097e6f77b0c81e4a7a7a6e22c1a Mon Sep 17 00:00:00 2001 From: huangwei5 Date: Wed, 7 Nov 2018 10:21:59 +0800 Subject: [PATCH 2/2] fix message format --- bin/dsn.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dsn.cmake b/bin/dsn.cmake index 99091260fe..c32bd08a5a 100644 --- a/bin/dsn.cmake +++ b/bin/dsn.cmake @@ -271,7 +271,7 @@ function(dsn_setup_system_libs) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON) - message("set FIND_LIBRARY_USE_LIB64_PATHS ON") + message(STATUS "FIND_LIBRARY_USE_LIB64_PATHS = ON") endif() set(DSN_SYSTEM_LIBS "")