[Cmake-commits] CMake branch, next, updated. v3.5.2-1391-g3f70479
Roger Leigh
rleigh at codelibre.net
Fri May 13 13:36:24 EDT 2016
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, next has been updated
via 3f70479e1714a16cd505d2930e414cb7cd72a5a2 (commit)
via 387ee29bc26fa445081d888fc6900182e9617c98 (commit)
from f4b43522ecd7880cd24b9f6895003342e476d06d (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=3f70479e1714a16cd505d2930e414cb7cd72a5a2
commit 3f70479e1714a16cd505d2930e414cb7cd72a5a2
Merge: f4b4352 387ee29
Author: Roger Leigh <rleigh at codelibre.net>
AuthorDate: Fri May 13 13:36:23 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 13 13:36:23 2016 -0400
Merge topic 'boost-component-headers' into next
387ee29b FindBoost: Check headers exist without find_path
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=387ee29bc26fa445081d888fc6900182e9617c98
commit 387ee29bc26fa445081d888fc6900182e9617c98
Author: Roger Leigh <r.leigh at dundee.ac.uk>
AuthorDate: Fri May 13 18:26:24 2016 +0100
Commit: Roger Leigh <r.leigh at dundee.ac.uk>
CommitDate: Fri May 13 18:31:20 2016 +0100
FindBoost: Check headers exist without find_path
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 2ec4925..777003b 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1435,10 +1435,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
_Boost_COMPONENT_HEADERS("${COMPONENT}" Boost_${UPPERCOMPONENT}_HEADER_NAME)
# Look for a standard boost header file.
if(Boost_${UPPERCOMPONENT}_HEADER_NAME)
- find_path(Boost_${UPPERCOMPONENT}_HEADER
- NAMES ${Boost_${UPPERCOMPONENT}_HEADER_NAME}
- HINTS ${Boost_INCLUDE_DIR}
- )
+ if(EXISTS "${Boost_INCLUDE_DIR}/${Boost_${UPPERCOMPONENT}_HEADER_NAME}")
+ set(Boost_${UPPERCOMPONENT}_HEADER ON)
+ else()
+ set(Boost_${UPPERCOMPONENT}_HEADER OFF)
+ endif()
else()
set(Boost_${UPPERCOMPONENT}_HEADER ON)
message(WARNING "No header defined for ${COMPONENT}; skipping header check")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list