From 8af8a15674f808ac3494bbd93b5b9eb626926a48 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 24 Sep 2012 19:51:03 +0000 Subject: [PATCH] Small Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26685 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_deal_ii.cmake | 33 ++++++++++++++++++------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index b24210b33a..3748b3a6c7 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -55,9 +55,8 @@ LIST(APPEND DEAL_II_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}" ) - # -# The library name: +# A lot of magic to guess the resulting library names: # IF(BUILD_SHARED_LIBS) @@ -68,17 +67,23 @@ ELSE() SET(DEAL_II_LIBRARY_NAME_DEBUG ${CMAKE_STATIC_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${DEAL_II_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} ) ENDIF() -LIST(APPEND DEAL_II_LIBRARIES_DEBUG - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}" - ) -LIST(APPEND DEAL_II_LIBRARIES_RELEASE - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}" - ) +IF(CMAKE_BUILD_TYPE MATCHES "Debug") + LIST(APPEND DEAL_II_LIBRARIES_DEBUG + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}" + ) + LIST(APPEND DEAL_II_LIBRARIES + DEBUG + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}" + ) +ENDIF() -LIST(APPEND DEAL_II_LIBRARIES - DEBUG - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}" - RELEASE - "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}" - ) +IF(CMAKE_BUILD_TYPE MATCHES "Release") + LIST(APPEND DEAL_II_LIBRARIES_RELEASE + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}" + ) + LIST(APPEND DEAL_II_LIBRARIES + RELEASE + "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}" + ) +ENDIF() -- 2.39.5