]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Clarify some error messages
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 08:15:40 +0000 (08:15 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 08:15:40 +0000 (08:15 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26707 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_boost.cmake
deal.II/cmake/configure/configure_doxygen.cmake
deal.II/cmake/setup_cached_variables.cmake
deal.II/cmake/setup_compiler_flags_intel.cmake
deal.II/cmake/setup_custom_targets.cmake
deal.II/cmake/setup_finalize.cmake

index 32e36651a6628c69892005cb72637add19bc9404..f17f90ca098a9f11782502422d4329ff7802744a 100644 (file)
@@ -97,3 +97,17 @@ ENDMACRO()
 
 CONFIGURE_FEATURE(BOOST)
 
+
+#
+# DEAL_II_WITH_BOOST is always required.
+#
+IF(NOT DEAL_II_WITH_BOOST)
+  IF(DEAL_II_FEATURE_AUTODETECTION)
+    FEATURE_ERROR_MESSAGE("BOOST")
+  ELSE()
+    MESSAGE(SEND_ERROR "\n"
+      "Unmet configuration requirements: "
+      "DEAL_II_WITH_BOOST required, but set to OFF!.\n\n"
+      )
+  ENDIF()
+ENDIF()
index 6831e0713f76c2e133697a2285467e7b7bb0e610..4b639b4c12933af8b19a67a51da094c7ae07012c 100644 (file)
@@ -48,3 +48,18 @@ ENDMACRO()
 
 CONFIGURE_FEATURE(DOXYGEN)
 
+#
+# Additional dependency check:
+# DEAL_II_COMPONENT_DOCUMENTATION needs DEAL_II_WITH_DOXYGEN
+#
+IF(DEAL_II_COMPONENT_DOCUMENTATION AND NOT DEAL_II_WITH_DOXYGEN)
+  IF(DEAL_II_FEATURE_AUTODETECTION)
+    FEATURE_DOXYGEN_ERROR_MESSAGE()
+  ELSE()
+    MESSAGE(SEND_ERROR "\n"
+      "DEAL_II_COMPONENT_DOCUMENTATION has unmet configuration requirements: "
+      "DEAL_II_WITH_DOXYGEN required, but set to OFF!\n\n"
+      )
+  ENDIF()
+ENDIF()
+
index 1a7ab5250153ed04bc38cf8d19e0ae359064945b..bc62714c1188eccead867edc3a43291d59b6b4eb 100644 (file)
@@ -1,3 +1,4 @@
+
 #
 # Setup cached variables prior to the PROJECT(deal.II) call
 #
@@ -94,8 +95,10 @@ SET(deal_ii_used_flags
   )
 FOREACH(flag ${deal_ii_used_flags})
 
+  #
   # "CACHE" ensures that we only set the variable if it is not already set
-  # as a  cached variable, effectively we're setting a default value:
+  # as a  cached variable. Effectively we're setting a default value:
+  #
   SET(${flag} "" CACHE STRING
    "The user supplied cache variable will be appended _at the end_ of the auto generated ${flag} variable"
    )
@@ -103,7 +106,7 @@ FOREACH(flag ${deal_ii_used_flags})
   #
   # Save the initial (cached) variable at this point and clear it.
   # ${flags}_SAVED will be appended to ${flags} in
-  # setup_cached_compiler_flags_finalize.cmake (called at the end of the
+  # setup_finalize.cmake (called at the end of the
   # main CMakeLists.txt file).
   #
   SET(${flag}_SAVED "${${flag}}")
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ce5208a53bbb3aabe52cf8bf3e78546a030ee94d 100644 (file)
@@ -0,0 +1,5 @@
+
+#
+# *Yeah*
+#
+
index c8cbb94147c231486c02907877d70b6f7c29b6a4..823424231e168a5e0fd04b41bcd14d2e311b83dd 100644 (file)
@@ -1,12 +1,16 @@
 
 #
-# Setup some convenience custom targets for the build system:
+# Setup some convenience custom targets for the build system, i.e.
 #
-
+#   $ make <custom_target>.
+#
+# We add custom targets for building all targets necessary to install a
+# specific component (too bad, we have to do this by hand. There is no cmake
+# internal way to do this, yet...):
+#
+#   library, documentation, compat_files, project_config
 #
-# Custom targets for building all targets necessary to install a specific
-# component. (Too bad, we have to do this by hand. There is no cmake
-# internal way to do this, yet...)
+# And a release and debug target (depending on configuration)
 #
 
 ADD_CUSTOM_TARGET(library)
index 355d4fec138e483e5ce09b7f531f1d5048e5bd80..45ddaecdc055c04fe011af23f5889530fc352236 100644 (file)
@@ -3,30 +3,6 @@
 #
 
 
-#
-# Dependency check:
-#
-# - DEAL_II_COMPONENT_DOCUMENTATION needs DEAL_II_WITH_DOXYGEN.
-#
-# - DEAL_II_WITH_BOOST has to be enabled.
-#
-# TODO: It is a bit sloppy to test this here. But this is the only
-# dependency of this kind atm.
-#
-IF(DEAL_II_COMPONENT_DOCUMENTATION AND NOT DEAL_II_WITH_DOXYGEN)
-  MESSAGE(SEND_ERROR "\n"
-    "DEAL_II_COMPONENT_DOCUMENTATION has unmet configuration requirements: "
-    "DEAL_II_WITH_DOXYGEN required, but set to OFF!\n\n"
-    )
-ENDIF()
-
-IF(NOT DEAL_II_WITH_BOOST)
-  MESSAGE(SEND_ERROR "\n"
-    "Unmet configuration requirements: "
-    "DEAL_II_WITH_BOOST required, but set to OFF!.\n\n"
-    )
-ENDIF()
-
 
 #
 # Hide some cmake specific cached variables. This is annoying...
@@ -96,13 +72,18 @@ The contrib UMFPACK library will be compiled with the following C compiler:
   ENDIF()
 ENDIF()
 
-
 IF(NOT DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
-  MESSAGE("\n
-WARNING: DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS is set to OFF\n")
+  MESSAGE("\n"
+    "WARNING: DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS is set to OFF\n"
+    )
+ELSE()
+  IF(NOT DEAL_II_KNOWN_COMPILER)
+    MESSAGE("\n"
+      "WARNING: Unknown compiler! Please set compiler flags by hand.\n"
+      )
+  ENDIF()
 ENDIF()
 
-
 MESSAGE("
   Configured Features ("
   "DEAL_II_FEATURE_AUTODETECTION = ${DEAL_II_FEATURE_AUTODETECTION}, "

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.