]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
CMake: Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 29 Mar 2013 00:54:45 +0000 (00:54 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 29 Mar 2013 00:54:45 +0000 (00:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@29109 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/config/Config.cmake.in
deal.II/doc/CMakeLists.txt

index d15fb2fc1264206f321c49228d0006836d4da5f3..2a31e3a28b69bd575a683d716cf922812edf3ffb 100644 (file)
@@ -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@")
index 0ebd34ef88f2518e34451141114fc450ca9681f0..6d9e9412de74dcc47aaad0d8a98f5394cab0ce1c 100644 (file)
@@ -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
   )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.