From de4c03e52bed7d0ffa04ec1e4cb38fc1c9bffa39 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 29 Mar 2013 00:54:45 +0000 Subject: [PATCH] CMake: Bugfixes git-svn-id: https://svn.dealii.org/trunk@29109 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/Config.cmake.in | 3 ++- deal.II/doc/CMakeLists.txt | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/deal.II/cmake/config/Config.cmake.in b/deal.II/cmake/config/Config.cmake.in index d15fb2fc12..2a31e3a28b 100644 --- a/deal.II/cmake/config/Config.cmake.in +++ b/deal.II/cmake/config/Config.cmake.in @@ -43,7 +43,8 @@ SET(DEAL_II_BUILD_TYPES "@DEAL_II_BUILD_TYPES@") SET(DEAL_II_CMAKE_MACROS_RELDIR "@DEAL_II_CMAKE_MACROS_RELDIR@") SET(DEAL_II_COMMON_RELDIR "@DEAL_II_COMMON_RELDIR@") -SET(DEAL_II_DOCUMENTATION_RELDIR "@DEAL_II_DOCUMENTATION_RELDIR@") +SET(DEAL_II_DOCREADME_RELDIR "@DEAL_II_DOCREADME_RELDIR@") +SET(DEAL_II_DOCHTML_RELDIR "@DEAL_II_DOCHTML_RELDIR@") SET(DEAL_II_EXAMPLES_RELDIR "@DEAL_II_EXAMPLES_RELDIR@") SET(DEAL_II_EXECUTABLE_RELDIR "@DEAL_II_EXECUTABLE_RELDIR@") SET(DEAL_II_INCLUDE_RELDIR "@DEAL_II_INCLUDE_RELDIR@") diff --git a/deal.II/doc/CMakeLists.txt b/deal.II/doc/CMakeLists.txt index 0ebd34ef88..6d9e9412de 100644 --- a/deal.II/doc/CMakeLists.txt +++ b/deal.II/doc/CMakeLists.txt @@ -70,10 +70,18 @@ ENDIF(DEAL_II_COMPONENT_DOCUMENTATION) # # Always install a minimalistic README and LICENSE file: # + +# Bloody hack to get an empty relative path: +IF(NOT "${DEAL_II_DOCREADME_RELDIR}" STREQUAL "") + SET(_foo ${DEAL_II_DOCREADME_RELDIR}) +ELSE() + SET(_foo \${__empty}) +ENDIF() + SET(_destination) INSTALL(FILES ${CMAKE_SOURCE_DIR}/README ${CMAKE_SOURCE_DIR}/LICENSE - DESTINATION ${CMAKE_INSTALL_PREFIX}/${DEAL_II_DOCREADME_RELDIR} + DESTINATION ${_foo} COMPONENT library ) -- 2.39.5