]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: The tbb headers are needed on client side, too.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 22 Oct 2012 17:00:26 +0000 (17:00 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 22 Oct 2012 17:00:26 +0000 (17:00 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27165 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/bundled/CMakeLists.txt

index 6b9f7af966ee19d6df98c707029c166d35f6a6e1..d26d038f598aae91b058fbbdffcb9421767bf578 100644 (file)
@@ -67,7 +67,8 @@ ENDIF()
 #
 # Threading Building Blocks library
 #
-IF(NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
+IF(NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN" AND
+   NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
   SET(FEATURE_TBB_HAVE_BUNDLED TRUE)
   SET(TBB_FOLDER "${CMAKE_SOURCE_DIR}/bundled/tbb30_104oss")
   OPTION(DEAL_II_FORCE_BUNDLED_TBB
@@ -76,6 +77,13 @@ IF(NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
 ENDIF()
 
 IF(FEATURE_TBB_BUNDLED_CONFIGURED)
+  INSTALL(DIRECTORY ${TBB_FOLDER}/include/tbb
+    DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
+    COMPONENT library
+    FILES_MATCHING PATTERN "*.h"
+    PATTERN ".svn" EXCLUDE
+    )
+
   ADD_SUBDIRECTORY(${TBB_FOLDER}/src)
 ENDIF()
 

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.