From: maier Date: Wed, 13 Mar 2013 14:55:19 +0000 (+0000) Subject: Cmake: Bugfixes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0468c684bb03d531ce26b510fe0dad86525297a;p=dealii-svn.git Cmake: Bugfixes git-svn-id: https://svn.dealii.org/trunk@28883 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index c576f0d10b..95a32211db 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -83,7 +83,8 @@ SET(DEAL_II_VERSION ${DEAL_II_VERSION_MAJOR}.${DEAL_II_VERSION_MINOR}) SET(DEAL_II_PROJECT_CONFIG_NAME "${DEAL_II_PACKAGE_NAME}") -SET_IF_EMPTY(DEAL_II_BASE_NAME "deal_II") +STRING(REPLACE "." "_" _base_name "${DEAL_II_PACKAGE_NAME}") +SET_IF_EMPTY(DEAL_II_BASE_NAME "${_base_name}") SET_IF_EMPTY(DEAL_II_DEBUG_SUFFIX ".g") SET_IF_EMPTY(DEAL_II_RELEASE_SUFFIX "") @@ -107,7 +108,7 @@ ELSE() # SET_IF_EMPTY(DEAL_II_CMAKE_MACROS_RELDIR "share/${DEAL_II_PACKAGE_NAME}/cmake/Macros") SET_IF_EMPTY(DEAL_II_DOCUMENTATION_RELDIR "share/doc/${DEAL_II_PACKAGE_NAME}/html") - SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "share/${DEAL_II_PACKAGE_NAME}/examples") + SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "share/doc/${DEAL_II_PACKAGE_NAME}/examples") SET_IF_EMPTY(DEAL_II_EXECUTABLE_RELDIR "bin") SET_IF_EMPTY(DEAL_II_INCLUDE_RELDIR "include") SET_IF_EMPTY(DEAL_II_LIBRARY_RELDIR "lib${LIB_SUFFIX}")