]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: We have to install the headers of contrib boost as well...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 07:49:45 +0000 (07:49 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 07:49:45 +0000 (07:49 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26703 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_boost.cmake
deal.II/cmake/setup_deal_ii.cmake

index 21fa1ff1432b4803226b9d36058a6d663210fa11..bbe2e809f498eabda0682d0aa74a15a0555005a6 100644 (file)
@@ -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)
+
index 3748b3a6c798c9db3c0364d1a50699b5dc787caa..d0d0e453d2054ad739d6b15ac9bf5f8d647c82dc 100644 (file)
@@ -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"
   )
 
 #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.