From: maier Date: Mon, 22 Oct 2012 17:00:26 +0000 (+0000) Subject: Bugfix: The tbb headers are needed on client side, too. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=948976281bdd5b4f3dd43c5009bd326db201fc03;p=dealii-svn.git Bugfix: The tbb headers are needed on client side, too. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27165 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 6b9f7af966..d26d038f59 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -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()