From d590f424c5b75b51dd0e1a2325be37b10a8a7b7e Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 30 Nov 2019 10:06:41 -0600 Subject: [PATCH] Do not export bundled subdirectory if empty Avoid recording a nonexistent include directory in case we do not install any bundled header files. --- cmake/config/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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} ) -- 2.39.5