]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
On the quest to better error messages
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 13 Sep 2012 09:13:01 +0000 (09:13 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 13 Sep 2012 09:13:01 +0000 (09:13 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26341 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_netcdf.cmake
deal.II/contrib/cmake/modules/FindAMD.cmake
deal.II/contrib/cmake/modules/FindNetcdf.cmake
deal.II/contrib/cmake/modules/FindTBB.cmake
deal.II/contrib/cmake/modules/FindUmfpack.cmake

index 72b65c06ba0234fb2a9920c874950e3da9f556c6..0527c29320f8b4fb394145505bab0cb37c0a957c 100644 (file)
@@ -61,7 +61,7 @@ OPTION(DEAL_II_WITH_METIS
 
 OPTION(DEAL_II_WITH_MPI
   "Build deal.II with support for mpi."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_WITH_NETCDF
   "Build deal.II with support for netcdf."
@@ -89,7 +89,7 @@ OPTION(DEAL_II_ALLOW_CONTRIB
   packages, so to ensure that only external libraries are used
   DEAL_II_ALLOW_CONTRIB as well as all DEAL_II_FORCE_CONTRIB_* have to be
   OFF"
-  ON)
+  OFF)
 
 OPTION(DEAL_II_FORCE_CONTRIB_FUNCTIONPARSER
   "Always use the bundled functionparser library instead of an external one."
index d48aa9cfbf5dd00d704a3d924e92ae3416b7f304..e5254875a55a2921377ec84872330e3ec9ee3c0d 100644 (file)
@@ -1,4 +1,8 @@
-FIND_PACKAGE(Netcdf REQUIRED)
+FIND_PACKAGE(Netcdf)
+
+  IF(NOT DEAL_II_ALLOW_CONTRIB AND NOT TBB_FOUND)
+    macro_warning_not_found("TBB")
+  ENDIF()
 
 INCLUDE_DIRECTORIES(${Netcdf_INCLUDE_DIR})
 
index 9fb3b4aa9bf341806a6ddbd763ece6d1792633b7..d8e96d8c405e73ce1fb8f0fb45abc4b014ea2602 100644 (file)
@@ -18,7 +18,9 @@ FIND_LIBRARY(AMD_LIBRARY
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(AMD DEFAULT_MSG AMD_LIBRARY AMD_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(
-  AMD_LIBRARY
-  AMD_INCLUDE_DIR
-)
+IF(AMD_FOUND)
+  MARK_AS_ADVANCED(
+    AMD_LIBRARY
+    AMD_INCLUDE_DIR
+  )
+ENDIF()
index 7d0e238a79cd60f2024a604fd5f82c8de3a4fe7c..8871b344ecba30caef02d14c50d56c35f9de4208 100644 (file)
@@ -17,7 +17,9 @@ FIND_LIBRARY(Netcdf_LIBRARY
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Netcdf DEFAULT_MSG Netcdf_LIBRARY Netcdf_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(
-  Netcdf_LIBRARY
-  Netcdf_INCLUDE_DIR
-)
+IF(Netcdf_FOUND)
+  MARK_AS_ADVANCED(
+    Netcdf_LIBRARY
+    Netcdf_INCLUDE_DIR
+  )
+ENDIF()
index fbea8a24b0465477e1ce4c39190416fbd0ad7c76..86535929e06adf5beb68ec31911d9e743c3d46ad 100644 (file)
@@ -27,8 +27,10 @@ FIND_LIBRARY(TBB_DEBUG_LIBRARY
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB_DEBUG DEFAULT_MSG TBB_DEBUG_LIBRARY TBB_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(
-  TBB_LIBRARY
-  TBB_DEBUG_LIBRARY
-  TBB_INCLUDE_DIR
-)
+IF(TBB_FOUND)
+  MARK_AS_ADVANCED(
+    TBB_LIBRARY
+    TBB_DEBUG_LIBRARY
+    TBB_INCLUDE_DIR
+  )
+ENDIF()
index 7d3c2a1beeb136622196d7f2517e4c758faa52b9..274ee62757be5c3c9b28e245553649eec6d141ba 100644 (file)
@@ -18,7 +18,9 @@ FIND_LIBRARY(Umfpack_LIBRARY
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Umfpack DEFAULT_MSG Umfpack_LIBRARY Umfpack_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(
-  Umfpack_LIBRARY
-  Umfpack_INCLUDE_DIR
-)
+IF(Umfpack_FOUND)
+  MARK_AS_ADVANCED(
+    Umfpack_LIBRARY
+    Umfpack_INCLUDE_DIR
+  )
+ENDIF()

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.