]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Do not export bundled subdirectory if empty 9115/head
authorMatthias Maier <tamiko@43-1.org>
Sat, 30 Nov 2019 16:06:41 +0000 (10:06 -0600)
committerMatthias Maier <tamiko@43-1.org>
Sat, 30 Nov 2019 16:16:57 +0000 (10:16 -0600)
Avoid recording a nonexistent include directory in case we do not
install any bundled header files.

cmake/config/CMakeLists.txt

index 2b99e76366aa0f94bb4a29f2db62b0ec64eb6f1b..fc9bfa923ffa2b94338a4ea08194811f2d9ab345 100644 (file)
@@ -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}
   )
 

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.