mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Use NAMES_PER_DIR in all lookups

Browse Source 
CMake has a surprising default behavior where looking up a library by
multiple names gives the name order higher priority than the directory
search order.

For example, if your system provides "llvm-config-14" and
CMAKE_PREFIX_PATH includes "llvm-config", CMake will always end up
choosing the system-provided llvm-config-14.

This change add NAMES_PER_DIR to request the more sensible behavior:
directory search order has higher priority than name order, so
CMAKE_PREFIX_PATH always wins over system-provided tools/libraries.
This commit is contained in:
Cody Tapscott 2022-07-13 10:36:25 -07:00 committed by Andrew Kelley
parent a455927150
commit dd70336f3a
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -31,7 +31,7 @@ set(ZIG_VERSION "" CACHE STRING "Override Zig version string. Default is to find
if("${ZIG_VERSION}" STREQUAL "") if("${ZIG_VERSION}" STREQUAL "")
set(ZIG_VERSION "${ZIG_VERSION_MAJOR}.${ZIG_VERSION_MINOR}.${ZIG_VERSION_PATCH}") set(ZIG_VERSION "${ZIG_VERSION_MAJOR}.${ZIG_VERSION_MINOR}.${ZIG_VERSION_PATCH}")
find_program(GIT_EXE NAMES git) find_program(GIT_EXE NAMES git NAMES_PER_DIR)
if(GIT_EXE) if(GIT_EXE)
execute_process( execute_process(
COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} describe --match *.*.* --tags COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} describe --match *.*.* --tags
@ -110,13 +110,13 @@ find_package(lld 14)
if(ZIG_STATIC_ZLIB) if(ZIG_STATIC_ZLIB)
list(REMOVE_ITEM LLVM_LIBRARIES "-lz") list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
find_library(ZLIB NAMES libz.a libzlibstatic.a z zlib libz) find_library(ZLIB NAMES libz.a libzlibstatic.a z zlib libz NAMES_PER_DIR)
list(APPEND LLVM_LIBRARIES "${ZLIB}") list(APPEND LLVM_LIBRARIES "${ZLIB}")
endif() endif()
if(APPLE AND ZIG_STATIC) if(APPLE AND ZIG_STATIC)
list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses") list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")
find_library(CURSES NAMES libcurses.a libncurses.a find_library(CURSES NAMES libcurses.a libncurses.a NAMES_PER_DIR
PATHS PATHS
/usr/local/opt/ncurses/lib /usr/local/opt/ncurses/lib
/opt/homebrew/opt/ncurses/lib) /opt/homebrew/opt/ncurses/lib)

3
cmake/Findclang.cmake
View File

@ -25,6 +25,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
clang-cpp-14.0 clang-cpp-14.0
clang-cpp140 clang-cpp140
clang-cpp clang-cpp
NAMES_PER_DIR
PATHS PATHS
${CLANG_LIBDIRS} ${CLANG_LIBDIRS}
/usr/lib/llvm/14/lib /usr/lib/llvm/14/lib
@ -40,7 +41,7 @@ endif()
if(NOT CLANG_LIBRARIES) if(NOT CLANG_LIBRARIES)
macro(FIND_AND_ADD_CLANG_LIB _libname_) macro(FIND_AND_ADD_CLANG_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} NAMES_PER_DIR
PATHS PATHS
${CLANG_LIBDIRS} ${CLANG_LIBDIRS}
/usr/lib/llvm/14/lib /usr/lib/llvm/14/lib

4
cmake/Findlld.cmake
View File

@ -15,7 +15,7 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
/opt/homebrew/opt/llvm@14/include /opt/homebrew/opt/llvm@14/include
/mingw64/include) /mingw64/include)
find_library(LLD_LIBRARY NAMES lld-14.0 lld140 lld find_library(LLD_LIBRARY NAMES lld-14.0 lld140 lld NAMES_PER_DIR
PATHS PATHS
/usr/lib/llvm-14/lib /usr/lib/llvm-14/lib
/usr/local/llvm140/lib /usr/local/llvm140/lib
@ -28,7 +28,7 @@ if(EXISTS ${LLD_LIBRARY})
else() else()
macro(FIND_AND_ADD_LLD_LIB _libname_) macro(FIND_AND_ADD_LLD_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} NAMES_PER_DIR
PATHS PATHS
${LLD_LIBDIRS} ${LLD_LIBDIRS}
/usr/lib/llvm-14/lib /usr/lib/llvm-14/lib

9
cmake/Findllvm.cmake
View File

@ -27,6 +27,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
LLVM-14 LLVM-14
LLVM-140 LLVM-140
LLVM LLVM
NAMES_PER_DIR
PATHS PATHS
${LLVM_LIBDIRS} ${LLVM_LIBDIRS}
/usr/lib/llvm/14/lib /usr/lib/llvm/14/lib
@ -40,7 +41,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
) )
find_program(LLVM_CONFIG_EXE find_program(LLVM_CONFIG_EXE
NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config NAMES_PER_DIR
PATHS PATHS
"/mingw64/bin" "/mingw64/bin"
"/c/msys64/mingw64/bin" "/c/msys64/mingw64/bin"
@ -71,7 +72,7 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
endif() endif()
elseif(ZIG_USE_LLVM_CONFIG) elseif(ZIG_USE_LLVM_CONFIG)
find_program(LLVM_CONFIG_EXE find_program(LLVM_CONFIG_EXE
NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config NAMES_PER_DIR
PATHS PATHS
"/mingw64/bin" "/mingw64/bin"
"/c/msys64/mingw64/bin" "/c/msys64/mingw64/bin"
@ -173,7 +174,7 @@ elseif(ZIG_USE_LLVM_CONFIG)
set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
if(NOT LLVM_LIBRARIES) if(NOT LLVM_LIBRARIES)
find_library(LLVM_LIBRARIES NAMES LLVM LLVM-14 LLVM-14.0) find_library(LLVM_LIBRARIES NAMES LLVM LLVM-14 LLVM-14.0 NAMES_PER_DIR)
endif() endif()
link_directories("${CMAKE_PREFIX_PATH}/lib") link_directories("${CMAKE_PREFIX_PATH}/lib")
@ -184,7 +185,7 @@ else()
macro(FIND_AND_ADD_LLVM_LIB _libname_) macro(FIND_AND_ADD_LLVM_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_} PATHS ${LLVM_LIBDIRS}) find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_} NAMES_PER_DIR PATHS ${LLVM_LIBDIRS})
set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_${_prettylibname_}_LIB}) set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_${_prettylibname_}_LIB})
endmacro(FIND_AND_ADD_LLVM_LIB) endmacro(FIND_AND_ADD_LLVM_LIB)