]> https://gitweb.dealii.org/ - dealii.git/commitdiff
disable intel system includes 8986/head
authorTimo Heister <timo.heister@gmail.com>
Sun, 20 Oct 2019 15:24:50 +0000 (17:24 +0200)
committerTimo Heister <timo.heister@gmail.com>
Fri, 1 Nov 2019 12:26:29 +0000 (08:26 -0400)
fixes #8374

cmake/macros/macro_deal_ii_setup_target.cmake

index 716c00cdfa1ebcd20ca54cda73b391b78fdb9fcf..20f300da931f020df418997d1c4a37f8fdaf3899 100644 (file)
@@ -103,7 +103,15 @@ MACRO(DEAL_II_SETUP_TARGET _target)
     SET(_build "RELEASE")
   ENDIF()
 
-  TARGET_INCLUDE_DIRECTORIES(${_target} SYSTEM PRIVATE ${DEAL_II_INCLUDE_DIRS})
+  IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    # Intel (at least up to 19.0.5) confuses an external TBB installation with
+    # our selected one if we use -Isystem includes. Work around this by using
+    # normal includes.
+    # See https://github.com/dealii/dealii/issues/8374 for details.
+    TARGET_INCLUDE_DIRECTORIES(${_target} PRIVATE ${DEAL_II_INCLUDE_DIRS})
+  ELSE()
+    TARGET_INCLUDE_DIRECTORIES(${_target} SYSTEM PRIVATE ${DEAL_II_INCLUDE_DIRS})
+  ENDIF()
 
   SET_PROPERTY(TARGET ${_target} APPEND_STRING PROPERTY
     LINK_FLAGS " ${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}"

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.