]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add RELDIR variables
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 10:21:54 +0000 (10:21 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 10:21:54 +0000 (10:21 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26589 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/macros/macro_set_if_empty.cmake [new file with mode: 0644]
deal.II/contrib/cmake/setup_deal_ii.cmake
deal.II/contrib/config/deal.IIConfig.cmake.in
deal.II/examples/CMakeLists.txt
deal.II/include/CMakeLists.txt
deal.II/source/CMakeLists.txt

diff --git a/deal.II/contrib/cmake/macros/macro_set_if_empty.cmake b/deal.II/contrib/cmake/macros/macro_set_if_empty.cmake
new file mode 100644 (file)
index 0000000..5f89dbc
--- /dev/null
@@ -0,0 +1,6 @@
+
+MACRO(SET_IF_EMPTY variable value)
+  IF(NOT ${${variable}} STREQUAL "")
+    SET(${variable} ${value})
+ENDMACRO()
+
index b7536d7ef51190c20e94b7f49a80cc56af853453..70194807013d7a5334780b33ceb74228ce5e0978 100644 (file)
@@ -4,9 +4,7 @@
 
 
 SET(DEAL_II_PACKAGE_NAME "deal.II")
-
 SET(DEAL_II_PACKAGE_VERSION ${VERSION})
-
 SET(DEAL_II_PACKAGE_STRING
   "${DEAL_II_PACKAGE_NAME} ${DEAL_II_PACKAGE_VERSION}"
   )
@@ -18,11 +16,32 @@ STRING(REGEX REPLACE
   "^[0-9]+\\.([0-9]+).*" "\\1" DEAL_II_MINOR "${VERSION}"
   )
 
+
 SET(DEAL_II_PATH ${CMAKE_INSTALL_PREFIX})
 
-SET(DEAL_II_PACKAGE_BUGREPORT "dealii@dealii.org")
+IF(DEAL_II_INSTALL_COMPAT_FILES)
+  #
+  # The good, old directory structure:
+  #
+  SET(DEAL_II_DOCUMENTATION_RELDIR "doc")
+  SET(DEAL_II_EXAMPLES_RELDIR "examples")
+  SET(DEAL_II_INCLUDE_RELDIR "include")
+  SET(DEAL_II_LIBRARY_RELDIR "lib")
+  SET(DEAL_II_PROJECT_CONFIG_RELDIR "lib/cmake")
+
+ELSE()
+  #
+  # IF DEAL_II_INSTALL_COMPAT_FILES is not set, we assume that we have to
+  # obey the FSHS...
+  #
+  SET_IF_EMPTY(DEAL_II_DOCUMENTATION_RELDIR "share/doc/deal.II/html")
+  SET_IF_EMPTY(DEAL_II_EXAMPLES_RELDIR "share/doc/deal.II/examples")
+  SET_IF_EMPTY(DEAL_II_INCLUDE_RELDIR "include")
+  SET_IF_EMPTY(DEAL_II_LIBRARY_RELDIR "lib${LIB_SUFFIX}")
+  SET_IF_EMPTY(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_LIBRARY_RELDIR}/cmake")
+ENDIF()
 
+SET(DEAL_II_PACKAGE_BUGREPORT "dealii@dealii.org")
 SET(DEAL_II_PACKAGE_TARNAME ${DEAL_II_PACKAGE_NAME}) #TODO
-
 SET(DEAL_II_PACKAGE_URL "http://www.dealii.org")
 
index b8c6b7d1489c0c17c5f6218e3ef08d6a1f6d4c31..0b355dae7faeb1f22b51892a39f0eff1a0d2beb5 100644 (file)
@@ -11,8 +11,6 @@ SET(DEAL_II_VERSION "${DEAL_II_VERSION}")
 SET(DEAL_II_MAJOR "${DEAL_II_MAJOR}")
 SET(DEAL_II_MINOR "${DEAL_II_MINOR}")
 
-SET(DEAL_II_PATH "${CMAKE_INSTALL_PREFIX}")
-
 SET(DEAL_II_PACKAGE_NAME "${DEAL_II_PACKAGE_NAME}")
 SET(DEAL_II_PACKAGE_VERSION "${DEAL_II_PACKAGE_VERSION}")
 SET(DEAL_II_PACKAGE_STRING "${DEAL_II_PACKAGE_STRING}")
@@ -21,11 +19,24 @@ SET(DEAL_II_PACKAGE_BUGREPORT "${DEAL_II_PACKAGE_BUGREPORT}")
 SET(DEAL_II_PACKAGE_TARNAME "${DEAL_II_PACKAGE_TARNAME}")
 SET(DEAL_II_PACKAGE_URL "${DEAL_II_PACKAGE_URL}")
 
+#
+# Information about the project location
+#
+
+SET(DEAL_II_PATH "${DEAL_II_PATH}")
+SET(DEAL_II_DOCUMENTATION_RELDIR "${DEAL_II_DOCUMENTATION_RELDIR}")
+SET(DEAL_II_EXAMPLES_RELDIR "${DEAL_II_EXAMPLES_RELDIR}")
+SET(DEAL_II_INCLUDE_RELDIR "${DEAL_II_INCLUDE_RELDIR}")
+SET(DEAL_II_LIBRARY_RELDIR "${DEAL_II_LIBRARY_RELDIR}")
+SET(DEAL_II_PROJECT_CONFIG_RELDIR "${DEAL_II_PROJECT_CONFIG_RELDIR}")
+
 
 #
 # Compiler and linker configuration
 #
 
+SET(DEAL_II_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+
 SET(DEAL_II_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
 SET(DEAL_II_CXX_COMPILER_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}")
 
@@ -34,22 +45,25 @@ SET(DEAL_II_C_COMPILER_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYP
 
 SET(DEAL_II_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 
-SET(DEAL_II_LINKER ${CMAKE_LINKER})
-SET(DEAL_II_AR ${CMAKE_AR})
+SET(DEAL_II_LINKER "${CMAKE_LINKER}")
+SET(DEAL_II_AR "${CMAKE_AR}")
 
 
 #
 # Information on how to find and use the deal.II installation
 #
 
-SET(DEAL_II_INCLUDE_DIRS "${DEAL_II_CONFIG_INCLUDE_DIRS}")
+SET(DEAL_II_INCLUDE_DIRS "${DEAL_II_INCLUDE_DIRS}")
 
-SET(DEAL_II_LIBRARIES "${DEAL_II_CONFIG_LIBRARIES}")
+SET(DEAL_II_LIBRARIES "${DEAL_II_LIBRARIES}")
 
 
 #
 # External libraries we have to link against
 #
 
+SET(DEAL_II_EXTERNAL_INCLUDE_DIRS "${DEAL_II_EXTERNAL_INCLUDE_DIRS}")
+
 SET(DEAL_II_EXTERNAL_LIBRARIES "${DEAL_II_EXTERNAL_LIBRARIES}")
 
+
index 1abc03180f9f157c11c40047c9034e2a84c6ab67..1b5df3649589a7e5c00a57a0deab2b5491e6378a 100644 (file)
@@ -1,13 +1,3 @@
-IF(DEAL_II_WITH_DOXYGEN)
-  #
-  # Generate the documentation via doxygen:
-  #
-
-  # TODO
-
-ENDIF(DEAL_II_WITH_DOXYGEN)
-
-
 
 IF(DEAL_II_INSTALL_EXAMPLES)
   #
@@ -23,22 +13,6 @@ IF(DEAL_II_INSTALL_EXAMPLES)
     step-42 step-43 step-44 step-45 step-46 step-47 step-48
     )
 
-
-  IF(DEAL_II_INSTALL_COMPAT_FILES)
-    #
-    # The good, old directory where examples get installed to:
-    #
-    SET(DEAL_II_EXAMPLES_RELDIR "examples")
-  ELSE()
-    #
-    # IF DEAL_II_INSTALL_COMPAT_FILES is not set, we assume that we have to
-    # obey the file system standard, so install to usr/share/doc/deal.II.
-    # (A path expected by the majority of distributions, but a bit
-    # inconvenient...)
-    #
-    SET(DEAL_II_EXAMPLES_RELDIR "usr/share/doc/deal.II/examples")
-  ENDIF()
-
   FOREACH(step ${deal_ii_examples})
     INSTALL(DIRECTORY ${step}
       DESTINATION ${DEAL_II_EXAMPLES_RELDIR}
index 64c80374129365ffe25d24f9480bd4160de58057..4580ddfa4e6e6a06b19bc125040a28b6e64a8c28 100644 (file)
@@ -31,7 +31,7 @@ ADD_DEPENDENCIES(deal_ii_target_dependencies lapack_templates)
 #
 
 INSTALL(DIRECTORY deal.II
-  DESTINATION include
+  DESTINATION ${DEAL_II_INCLUDE_RELDIR}
   COMPONENT library
   FILES_MATCHING PATTERN "*.h"
   )
@@ -40,7 +40,7 @@ INSTALL(DIRECTORY deal.II
 # and don't forget to install all generated header files, too:
 #
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deal.II
-  DESTINATION include
+  DESTINATION ${DEAL_II_INCLUDE_RELDIR}
   COMPONENT library
   FILES_MATCHING PATTERN "*.h"
   )
index ba0075877df6630385675a75e1e930186c801cea..06b4fc58873e74ca164510eae7dd6883a31a8930 100644 (file)
@@ -61,7 +61,7 @@ TARGET_LINK_LIBRARIES(deal_II ${deal_ii_external_libraries})
 #
 INSTALL(TARGETS deal_II
   LIBRARY
-  DESTINATION lib${LIB_SUFFIX}
+  DESTINATION ${DEAL_II_LIBRARY_RELDIR}
   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.