[Boost-commit] svn:boost r52969 - branches/release/tools/build/CMake

Subject: [Boost-commit] svn:boost r52969 - branches/release/tools/build/CMake
From: troy_at_[hidden]
Date: 2009-05-13 14:38:19

Author: troy
Date: 2009-05-13 14:38:18 EDT (Wed, 13 May 2009)
New Revision: 52969
URL: http://svn.boost.org/trac/boost/changeset/52969

Log:
make optional dependent on newer cmake version
Text files modified: 
   branches/release/tools/build/CMake/BoostCore.cmake |    10 +++++++++-                              
   1 files changed, 9 insertions(+), 1 deletions(-)

Modified: branches/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostCore.cmake	(original)
+++ branches/release/tools/build/CMake/BoostCore.cmake	2009-05-13 14:38:18 EDT (Wed, 13 May 2009)
@@ -192,10 +192,18 @@
       # Add this module's include directory
       include_directories("${Boost_SOURCE_DIR}/libs/${libname}/include")
      
+      #
+      # Horrible hackery.  Make install of headers from modularized directories
+      # OPTIONAL, which only works on cmake >= 2.7
+      # 
+      if (${CMAKE_MAJOR_VERSION} GREATER 1 AND ${CMAKE_MINOR_VERSION} GREATER 6)
+	set(_INSTALL_OPTIONAL "OPTIONAL")
+      endif()
+
       # Install this module's headers
       install(DIRECTORY include/boost 
         DESTINATION ${BOOST_HEADER_DIR}
-	OPTIONAL
+	${_INSTALL_OPTIONAL}
         COMPONENT ${libname}_headers
         PATTERN "CVS" EXCLUDE
         PATTERN ".svn" EXCLUDE)