From: Matthias Maier <tamiko@43-1.org>
Date: Sat, 30 Nov 2019 16:06:41 +0000 (-0600)
Subject: Do not export bundled subdirectory if empty
X-Git-Tag: v9.2.0-rc1~829^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9115%2Fhead;p=dealii.git

Do not export bundled subdirectory if empty

Avoid recording a nonexistent include directory in case we do not
install any bundled header files.
---

diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt
index 2b99e76366..fc9bfa923f 100644
--- a/cmake/config/CMakeLists.txt
+++ b/cmake/config/CMakeLists.txt
@@ -150,10 +150,20 @@ CONFIGURE_FILE(
 # For installation:
 #
 
+# Make sure that we only ever record the bundled subdirectory if it is in
+# fact created:
+IF("${DEAL_II_BUNDLED_INCLUDE_DIRS}" STREQUAL "")
+  SET(_installed_bundled "")
+ELSE()
+  SET(_installed_bundled
+    "\${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled"
+    )
+ENDIF()
+
 SET(CONFIG_BUILD_DIR FALSE)
 SET(CONFIG_INCLUDE_DIRS
   \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR}
-  \${DEAL_II_PATH}/\${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
+  ${_installed_bundled}
   ${DEAL_II_USER_INCLUDE_DIRS}
   )