From 45d273a8c2ae224643bbfc0325b329a8545bbaa7 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 4 Oct 2012 14:29:59 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26954 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/deal.II/config/CMakeLists.txt b/deal.II/config/CMakeLists.txt index a09c135935..a084ada088 100644 --- a/deal.II/config/CMakeLists.txt +++ b/deal.II/config/CMakeLists.txt @@ -37,7 +37,7 @@ INSTALL(FILES # Configure and install the cmake project configuration: # -IF(NOT "${CONFIG_EXTERNAL_LIBRARIES}" STREQUAL "") +IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES}" STREQUAL "") SET(CONFIG_EXTERNAL_LIBRARIES general ${DEAL_II_EXTERNAL_LIBRARIES} @@ -49,10 +49,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG} ) - LIST(APPEND CONFIG_EXTERNAL_LIBRARIES - debug - ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG} - ) + IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}" STREQUAL "") + LIST(APPEND CONFIG_EXTERNAL_LIBRARIES + debug + ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG} + ) + ENDIF() ENDIF() IF(CMAKE_BUILD_TYPE MATCHES "Release") @@ -60,10 +62,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "Release") ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE} ) - LIST(APPEND CONFIG_EXTERNAL_LIBRARIES - optimized - ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE} - ) + IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}" STREQUAL "") + LIST(APPEND CONFIG_EXTERNAL_LIBRARIES + optimized + ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE} + ) + ENDIF() ENDIF() CONFIGURE_FILE( -- 2.39.5