From b9734965406ed6444ccff3aa9266505f3969ec0f Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 25 Sep 2012 07:49:45 +0000 Subject: [PATCH] Bugfix: We have to install the headers of contrib boost as well... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26703 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_boost.cmake | 20 +++++++++++-------- deal.II/cmake/setup_deal_ii.cmake | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index 21fa1ff143..bbe2e809f4 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -67,14 +67,19 @@ MACRO(FEATURE_BOOST_CONFIGURE_CONTRIB var) "BOOST_NO_HASH" "BOOST_NO_SLIST" ) - INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/contrib/boost-1.49.0/include - ) + SET(boost_folder "${CMAKE_SOURCE_DIR}/contrib/boost-1.49.0") + + INCLUDE_DIRECTORIES(${boost_folder}/include) - ADD_SUBDIRECTORY( - ${CMAKE_SOURCE_DIR}/contrib/boost-1.49.0/libs/serialization/src + INSTALL(DIRECTORY ${boost_folder}/include + DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/contrib + COMPONENT library + FILES_MATCHING PATTERN "*.h" + PATTERN ".svn" EXCLUDE ) + ADD_SUBDIRECTORY(${boost_folder}/libs/serialization/src)) + IF( DEAL_II_USE_MT AND NOT DEAL_II_CAN_USE_CXX11) # # If the C++ compiler doesn't completely support the C++11 standard @@ -83,9 +88,7 @@ MACRO(FEATURE_BOOST_CONFIGURE_CONTRIB var) # we don't have to build BOOST itself only to get at this small part of # it. it also ensures that we use the correct compiler and flags # - ADD_SUBDIRECTORY( - ${CMAKE_SOURCE_DIR}/contrib/boost-1.49.0/libs/thread/src - ) + ADD_SUBDIRECTORY(${boost_folder}/libs/thread/src) ENDIF() SET(${var} TRUE) @@ -93,3 +96,4 @@ ENDMACRO() CONFIGURE_FEATURE(BOOST) + diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index 3748b3a6c7..d0d0e453d2 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -53,6 +53,8 @@ ENDIF() LIST(APPEND DEAL_II_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}" + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}/deal.II" + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}/deal.II/contrib" ) # -- 2.39.5