[Cmake-commits] CMake branch, next, updated. v3.0.0-3916-gd286e3a
Brad King
brad.king at kitware.com
Wed Jun 25 10:48:45 EDT 2014
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 d286e3a6d57c12c78a5d50423d03060ded9beea8 (commit)
via 37242f0a70c518a575bad11aee8f55c2759a74c6 (commit)
via 18766ddef1513532ae2fc375ced21b35f629e856 (commit)
from ed74754641c29bd83a916fc84d5d46c79c41b885 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d286e3a6d57c12c78a5d50423d03060ded9beea8
commit d286e3a6d57c12c78a5d50423d03060ded9beea8
Merge: ed74754 37242f0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 10:48:45 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 10:48:45 2014 -0400
Merge topic 'find-module-targets' into next
37242f0a Help: Drop release note for reverted FindBoost change
18766dde Revert "FindBoost.cmake: Add Boost::boost and Boost::<C> targets and documentation"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37242f0a70c518a575bad11aee8f55c2759a74c6
commit 37242f0a70c518a575bad11aee8f55c2759a74c6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 10:46:38 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 10:46:38 2014 -0400
Help: Drop release note for reverted FindBoost change
diff --git a/Help/release/dev/find-module-targets.rst b/Help/release/dev/find-module-targets.rst
index 3b3fb0a..98ea283 100644
--- a/Help/release/dev/find-module-targets.rst
+++ b/Help/release/dev/find-module-targets.rst
@@ -1,8 +1,6 @@
find-module-targets
-------------------
-* The :module:`FindBoost` module now provides imported targets.
-
* The :module:`FindGLUT` module now provides imported targets.
* The :module:`FindGLEW` module now provides imported targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18766ddef1513532ae2fc375ced21b35f629e856
commit 18766ddef1513532ae2fc375ced21b35f629e856
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 10:46:03 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 10:46:03 2014 -0400
Revert "FindBoost.cmake: Add Boost::boost and Boost::<C> targets and documentation"
This reverts commit 38da974d3ba4edf3aa6d233275fac53b08147bbb.
It will be revised after further discussion.
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index ceeb7e5..dfd4460 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -53,24 +53,6 @@
# Boost_<C>_LIBRARY_DEBUG - Component <C> library debug variant
# Boost_<C>_LIBRARY_RELEASE - Component <C> library release variant
#
-# In addition to the above variables this module creates the following
-# :prop_tgt:`IMPORTED` targets::
-#
-# Boost::boost - interface target containing the include
-# directory
-# Boost::<C> - shared or static library target for a
-# component (<C> is lower-case)
-# Boost::diagnostic_definitions - interface target to enable diagnostic
-# information about Boost's automatic linking
-# during compilation
-#
-# Component targets never depend on each even though they might
-# require each other. It is important to note that the imported
-# targets behave differently than variables created by this module:
-# multiple calls to find_package(Boost) in the same directory or
-# sub-directories with different options (e.g. static or shared) will
-# not override the values of the targets created by the first call.
-#
# Users may set these hints or results as cache entries. Projects
# should not read these entries directly but instead use the above
# result variables. Note that some hint names start in upper-case
@@ -542,13 +524,6 @@ if(Boost_DEBUG)
"Boost_NO_SYSTEM_PATHS = ${Boost_NO_SYSTEM_PATHS}")
endif()
-# Supply Boost_LIB_DIAGNOSTIC_DEFINITIONS as a convenience target. It
-# will only contain any interface definitions on WIN32, but is created
-# on all platforms to keep end user code free from platform dependent
-# code.
-if(NOT TARGET Boost::diagnostic_definitions)
- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
-endif()
if(WIN32)
# In windows, automatic linking is performed, so you do not have
# to specify the libraries. If you are linking to a dynamic
@@ -568,8 +543,6 @@ if(WIN32)
# code to emit a #pragma message each time a library is selected
# for linking.
set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
- set_target_properties(Boost::diagnostic_definitions PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
endif()
_Boost_CHECK_SPELLING(Boost_ROOT)
@@ -1182,36 +1155,11 @@ else()
endif()
# ------------------------------------------------------------------------
-# Notification to end user about what was found and creation of targets.
+# Notification to end user about what was found
# ------------------------------------------------------------------------
set(Boost_LIBRARIES "")
if(Boost_FOUND)
- if(NOT TARGET Boost::boost)
- add_library(Boost::boost INTERFACE IMPORTED)
- set_target_properties(Boost::boost PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIR}")
- endif()
-
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
- if(NOT TARGET Boost::${COMPONENT})
- if(Boost_USE_STATIC_LIBS)
- add_library(Boost::${COMPONENT} STATIC IMPORTED)
- else()
- # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
- # libraries as a result.
- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
- endif()
-
- set_target_properties(Boost::${COMPONENT} PROPERTIES
- IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}"
- IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}"
- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
- endif()
- endforeach()
-
if(NOT Boost_FIND_QUIETLY)
message(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
if(Boost_FIND_COMPONENTS)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/find-module-targets.rst | 2 --
Modules/FindBoost.cmake | 54 +-----------------------------
2 files changed, 1 insertion(+), 55 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list