Sfoglia il codice sorgente

Use stronger hint for 64bit Debian-based distro for finding 32bit lib.

Yao Wei Tjong 姚伟忠 10 anni fa
parent
commit
a30c075189
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      CMake/Modules/FindReadline.cmake

+ 2 - 2
CMake/Modules/FindReadline.cmake

@@ -33,10 +33,10 @@ if (APPLE AND NOT READLINE_INCLUDE_DIRS AND NOT READLINE_LIBRARIES)
     execute_process (COMMAND find /usr/local/Cellar/readline -type d -name lib OUTPUT_VARIABLE LIB_HINTS ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process (COMMAND find /usr/local/Cellar/readline -type d -name lib OUTPUT_VARIABLE LIB_HINTS ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 elseif (URHO3D_DEFAULT_64BIT AND NOT URHO3D_64BIT)
 elseif (URHO3D_DEFAULT_64BIT AND NOT URHO3D_64BIT)
     # To cater for 32-bit build on 64-bit host system using Debian-based distros; no special handling required for Redhat-based distros but no harm done in doing below
     # To cater for 32-bit build on 64-bit host system using Debian-based distros; no special handling required for Redhat-based distros but no harm done in doing below
-    set (LIB_PATHS PATHS /usr/lib32)
+    set (LIB_HINTS /usr/lib32)
 endif ()
 endif ()
 find_path (READLINE_INCLUDE_DIRS NAMES readline.h HINTS ${INC_HINTS} PATH_SUFFIXES readline DOC "Readline include directory")
 find_path (READLINE_INCLUDE_DIRS NAMES readline.h HINTS ${INC_HINTS} PATH_SUFFIXES readline DOC "Readline include directory")
-find_library (READLINE_LIBRARIES NAMES readline HINTS ${LIB_HINTS} ${LIB_PATHS} DOC "Readline library")
+find_library (READLINE_LIBRARIES NAMES readline HINTS ${LIB_HINTS} DOC "Readline library")
 if (NOT APPLE AND URHO3D_DEFAULT_64BIT AND NOT URHO3D_64BIT AND READLINE_LIBRARIES MATCHES 64)
 if (NOT APPLE AND URHO3D_DEFAULT_64BIT AND NOT URHO3D_64BIT AND READLINE_LIBRARIES MATCHES 64)
     unset (READLINE_LIBRARIES CACHE)    # Nullify the search result if the ABI is not matched
     unset (READLINE_LIBRARIES CACHE)    # Nullify the search result if the ABI is not matched
     unset (READLINE_LIBRARIES)
     unset (READLINE_LIBRARIES)