From 903a65ce0d22997c40769b1310216fa9b1241372 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:36:14 +0530 Subject: FindArmadillo use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindArmadillo.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/FindArmadillo.cmake b/Modules/FindArmadillo.cmake index 243b9e0..c8a31a0 100644 --- a/Modules/FindArmadillo.cmake +++ b/Modules/FindArmadillo.cmake @@ -84,6 +84,7 @@ if(_ARMA_USE_WRAPPER) # Link to the armadillo wrapper library. find_library(ARMADILLO_LIBRARY NAMES armadillo + NAMES_PER_DIR PATHS "$ENV{ProgramFiles}/Armadillo/lib" "$ENV{ProgramFiles}/Armadillo/lib64" -- cgit v0.12 From 764696dcd055110276399a798ba336ab3e90706e Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:37:04 +0530 Subject: FindBLAS use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindBLAS.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 29871c5..b2df4ad 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -208,6 +208,7 @@ macro(CHECK_BLAS_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _add if(_libraries_work) find_library(${_prefix}_${_library}_LIBRARY NAMES ${_library} + NAMES_PER_DIR PATHS ${_extaddlibdir} PATH_SUFFIXES ${_subdirs} ) -- cgit v0.12 From 739278e971d61e830877a9db8d40bd61e5611994 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:37:34 +0530 Subject: FindBZip2 use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindBZip2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index 98ab72c..5704d1d 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -45,8 +45,8 @@ set(_BZIP2_PATHS PATHS find_path(BZIP2_INCLUDE_DIR bzlib.h ${_BZIP2_PATHS} PATH_SUFFIXES include) if (NOT BZIP2_LIBRARIES) - find_library(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 libbz2 libbzip2 ${_BZIP2_PATHS} PATH_SUFFIXES lib) - find_library(BZIP2_LIBRARY_DEBUG NAMES bz2d bzip2d libbz2d libbzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib) + find_library(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 libbz2 libbzip2 NAMES_PER_DIR ${_BZIP2_PATHS} PATH_SUFFIXES lib) + find_library(BZIP2_LIBRARY_DEBUG NAMES bz2d bzip2d libbz2d libbzip2d NAMES_PER_DIR ${_BZIP2_PATHS} PATH_SUFFIXES lib) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) SELECT_LIBRARY_CONFIGURATIONS(BZIP2) -- cgit v0.12 From 6c77c615325881c5710062175c319ecac60a59b0 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:38:11 +0530 Subject: FindCURL use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindCURL.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index 919babc..3acadc2 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -92,6 +92,7 @@ if(NOT CURL_LIBRARY) curllib_static # Windows older "Win32 - MSVC" prebuilts (libcurl.lib, e.g. libcurl-7.15.5-win32-msvc.zip): libcurl + NAMES_PER_DIR HINTS ${PC_CURL_LIBRARY_DIRS} ) mark_as_advanced(CURL_LIBRARY_RELEASE) @@ -100,6 +101,7 @@ if(NOT CURL_LIBRARY) # Windows MSVC CMake builds in debug configuration on vcpkg: libcurl-d_imp libcurl-d + NAMES_PER_DIR HINTS ${PC_CURL_LIBRARY_DIRS} ) mark_as_advanced(CURL_LIBRARY_DEBUG) -- cgit v0.12 From 943bdc7fbd79ec93d8871806ff2d58c9f8a276ac Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:38:40 +0530 Subject: FindEXPAT use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindEXPAT.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 15b419a..b0bb02a 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -38,7 +38,7 @@ pkg_check_modules(PC_EXPAT QUIET expat) find_path(EXPAT_INCLUDE_DIR NAMES expat.h HINTS ${PC_EXPAT_INCLUDE_DIRS}) # Look for the library. -find_library(EXPAT_LIBRARY NAMES expat libexpat HINTS ${PC_EXPAT_LIBRARY_DIRS}) +find_library(EXPAT_LIBRARY NAMES expat libexpat NAMES_PER_DIR HINTS ${PC_EXPAT_LIBRARY_DIRS}) if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str -- cgit v0.12 From a2a1d5a0389f39abe2da0aa7b2a44fd83b990dfb Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:39:12 +0530 Subject: FindIconv use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindIconv.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/FindIconv.cmake b/Modules/FindIconv.cmake index bf20f6f..8fd5fba 100644 --- a/Modules/FindIconv.cmake +++ b/Modules/FindIconv.cmake @@ -110,6 +110,7 @@ endif() find_library(Iconv_LIBRARY NAMES ${Iconv_LIBRARY_NAMES} + NAMES_PER_DIR DOC "iconv library (potentially the C library)") mark_as_advanced(Iconv_INCLUDE_DIR) -- cgit v0.12 From 9d2c119ff5558c5c9d10b9d27b02c81e28c070f8 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:40:09 +0530 Subject: FindJPEG use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindJPEG.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 0bb6989..632fc9a 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -58,8 +58,8 @@ foreach(name ${jpeg_names}) endforeach() if(NOT JPEG_LIBRARY) - find_library(JPEG_LIBRARY_RELEASE NAMES ${jpeg_names}) - find_library(JPEG_LIBRARY_DEBUG NAMES ${jpeg_names_debug}) + find_library(JPEG_LIBRARY_RELEASE NAMES ${jpeg_names} NAMES_PER_DIR) + find_library(JPEG_LIBRARY_DEBUG NAMES ${jpeg_names_debug} NAMES_PER_DIR) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(JPEG) mark_as_advanced(JPEG_LIBRARY_RELEASE JPEG_LIBRARY_DEBUG) -- cgit v0.12 From 64d37b495343669a0b937715602697a66e446ba8 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:40:36 +0530 Subject: FindLibLZMA use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindLibLZMA.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake index 200d6bf..4a79a10 100644 --- a/Modules/FindLibLZMA.cmake +++ b/Modules/FindLibLZMA.cmake @@ -43,8 +43,8 @@ This module will set the following variables in your project: find_path(LIBLZMA_INCLUDE_DIR lzma.h ) if(NOT LIBLZMA_LIBRARY) - find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma PATH_SUFFIXES lib) - find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad PATH_SUFFIXES lib) + find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma NAMES_PER_DIR PATH_SUFFIXES lib) + find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad NAMES_PER_DIR PATH_SUFFIXES lib) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(LIBLZMA) else() -- cgit v0.12 From 667a229e8dc0648eba3cceb4202e967c17301817 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:41:17 +0530 Subject: FindProtobuf use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindProtobuf.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index e09717d..f6d8fe3 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -376,11 +376,13 @@ function(_protobuf_find_libraries name filename) else() find_library(${name}_LIBRARY_RELEASE NAMES ${filename} + NAMES_PER_DIR PATHS ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release) mark_as_advanced(${name}_LIBRARY_RELEASE) find_library(${name}_LIBRARY_DEBUG NAMES ${filename}d ${filename} + NAMES_PER_DIR PATHS ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) mark_as_advanced(${name}_LIBRARY_DEBUG) -- cgit v0.12 From ec6bbfd58d6f72125f21c050aab12480cce15448 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:42:02 +0530 Subject: FindIntl use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindIntl.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindIntl.cmake b/Modules/FindIntl.cmake index 3818d45..f72837e 100644 --- a/Modules/FindIntl.cmake +++ b/Modules/FindIntl.cmake @@ -40,7 +40,7 @@ find_path(Intl_INCLUDE_DIR mark_as_advanced(Intl_INCLUDE_DIR) # Find all Intl libraries -find_library(Intl_LIBRARY "intl" +find_library(Intl_LIBRARY "intl" NAMES_PER_DIR DOC "libintl libraries (if not in the C library)") mark_as_advanced(Intl_LIBRARY) -- cgit v0.12 From 8e671f2564d272baf5db407489cab6652b80bffd Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:42:24 +0530 Subject: FindLAPACK use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindLAPACK.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index 01ce074..decc034 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -162,6 +162,7 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a if(_libraries_work) find_library(${_prefix}_${_library}_LIBRARY NAMES ${_library} + NAMES_PER_DIR PATHS ${_extaddlibdir} PATH_SUFFIXES ${_subdirs} ) -- cgit v0.12 From 45ea7f9c802b5f882a068b78873bd4b2ad3477b9 Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:43:04 +0530 Subject: FindGLEW use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindGLEW.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake index 27ffa13..080371a 100644 --- a/Modules/FindGLEW.cmake +++ b/Modules/FindGLEW.cmake @@ -139,11 +139,13 @@ __glew_set_find_library_suffix(SHARED) find_library(GLEW_SHARED_LIBRARY_RELEASE NAMES GLEW glew glew32 + NAMES_PER_DIR PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch} PATHS ENV GLEW_ROOT) find_library(GLEW_SHARED_LIBRARY_DEBUG NAMES GLEWd glewd glew32d + NAMES_PER_DIR PATH_SUFFIXES lib lib64 PATHS ENV GLEW_ROOT) @@ -152,11 +154,13 @@ __glew_set_find_library_suffix(STATIC) find_library(GLEW_STATIC_LIBRARY_RELEASE NAMES GLEW glew glew32s + NAMES_PER_DIR PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch} PATHS ENV GLEW_ROOT) find_library(GLEW_STATIC_LIBRARY_DEBUG NAMES GLEWds glewds glew32ds + NAMES_PER_DIR PATH_SUFFIXES lib lib64 PATHS ENV GLEW_ROOT) -- cgit v0.12 From e6908b65b4fc8c20f61e27a903bf0b925ead318b Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:43:40 +0530 Subject: FindGIF use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindGIF.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index d5a143e..cea9cd8 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -60,6 +60,7 @@ set(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib giflib4) find_library(GIF_LIBRARY NAMES ${POTENTIAL_GIF_LIBS} + NAMES_PER_DIR HINTS ENV GIF_DIR PATH_SUFFIXES lib -- cgit v0.12 From 0d9d8dd054e26622ffdeb6c03870c35010d8885f Mon Sep 17 00:00:00 2001 From: Sibi Siddharthan Date: Thu, 2 Jul 2020 00:44:08 +0530 Subject: FindPNG use NAMES_PER_DIR Signed-off-by: Sibi Siddharthan --- Modules/FindPNG.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake index f1fe89a..fd0e4e9 100644 --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -76,8 +76,8 @@ if(ZLIB_FOUND) # For compatibility with versions prior to this multi-config search, honor # any PNG_LIBRARY that is already specified and skip the search. if(NOT PNG_LIBRARY) - find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES}) - find_library(PNG_LIBRARY_DEBUG NAMES ${PNG_NAMES_DEBUG}) + find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES} NAMES_PER_DIR) + find_library(PNG_LIBRARY_DEBUG NAMES ${PNG_NAMES_DEBUG} NAMES_PER_DIR) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(PNG) mark_as_advanced(PNG_LIBRARY_RELEASE PNG_LIBRARY_DEBUG) -- cgit v0.12