This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 941fbe31f56e0841280288bf3e43de873aabe957 (commit)
via 896ad251de49f167f4ce3cbbcf9a6cce85a16681 (commit)
from ff1cce464d6e372cd2aced01fac28394c213aca9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=941fbe31f56e0841280288bf3e43de873aabe957
commit 941fbe31f56e0841280288bf3e43de873aabe957
Merge: ff1cce4 896ad25
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 13 09:54:17 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 13 09:54:17 2016 -0400
Merge topic 'find-lib32'
896ad251 Teach find_library and find_package to search lib32 paths (#11260)
-----------------------------------------------------------------------
Summary of changes:
Help/command/find_library.rst | 7 +++++++
Help/manual/cmake-properties.7.rst | 1 +
Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst | 10 ++++++++++
Help/release/dev/find-lib32.rst | 7 +++++++
Modules/FindPkgConfig.cmake | 8 ++++++--
Modules/Platform/Linux.cmake | 3 ++-
Modules/Platform/OpenBSD.cmake | 1 +
Modules/Platform/UnixPaths.cmake | 3 ++-
Source/cmFindLibraryCommand.cxx | 9 ++++-----
Source/cmFindPackageCommand.cxx | 11 +++++++++++
Source/cmFindPackageCommand.h | 1 +
Source/cmMakefile.cxx | 8 ++++++++
Source/cmMakefile.h | 3 +++
Tests/CMakeOnly/find_library/CMakeLists.txt | 7 +++++++
.../CMakeOnly/find_library/lib/32/libtest5.a | 0
.../find_library/lib/A/{lib64 => lib32}/libtest3.a | 0
.../find_library/{lib/64 => lib32/A/lib}/libtest2.a | 0
.../CMakeOnly/find_library/lib32/A/lib32/libtest4.a | 0
.../CMakeOnly/find_library/lib32/A/libtest4.a | 0
.../CMakeOnly/find_library/lib32/libtest4.a | 0
.../FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake | 11 ++++++++---
.../FindPkgConfig/FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake | 11 ++++++++---
.../FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake | 3 ---
.../FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake | 11 ++++++++---
...PkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake | 11 ++++++++---
.../FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake | 11 ++++++++---
.../{lib/i386-linux-gnu => lib32}/pkgconfig/.placeholder | 0
.../i386-linux-gnu => pc-foo/lib32}/pkgconfig/.placeholder | 0
28 files changed, 110 insertions(+), 27 deletions(-)
create mode 100644 Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
create mode 100644 Help/release/dev/find-lib32.rst
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/CMakeOnly/find_library/lib/32/libtest5.a (100%)
copy Tests/CMakeOnly/find_library/lib/A/{lib64 => lib32}/libtest3.a (100%)
copy Tests/CMakeOnly/find_library/{lib/64 => lib32/A/lib}/libtest2.a (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/CMakeOnly/find_library/lib32/A/lib32/libtest4.a (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/CMakeOnly/find_library/lib32/A/libtest4.a (100%)
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/CMakeOnly/find_library/lib32/libtest4.a (100%)
copy Tests/RunCMake/FindPkgConfig/pc-bar/{lib/i386-linux-gnu =>
lib32}/pkgconfig/.placeholder (100%)
copy Tests/RunCMake/FindPkgConfig/{pc-bar/lib/i386-linux-gnu =>
pc-foo/lib32}/pkgconfig/.placeholder (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
