From 5ff56b643dcfbe7ea601538af535a4a257027a12 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 13 Sep 2012 09:13:01 +0000 Subject: [PATCH] On the quest to better error messages git-svn-id: https://svn.dealii.org/branches/branch_cmake@26341 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 4 ++-- .../contrib/cmake/configure/configure_netcdf.cmake | 6 +++++- deal.II/contrib/cmake/modules/FindAMD.cmake | 10 ++++++---- deal.II/contrib/cmake/modules/FindNetcdf.cmake | 10 ++++++---- deal.II/contrib/cmake/modules/FindTBB.cmake | 12 +++++++----- deal.II/contrib/cmake/modules/FindUmfpack.cmake | 10 ++++++---- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 72b65c06ba..0527c29320 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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." diff --git a/deal.II/contrib/cmake/configure/configure_netcdf.cmake b/deal.II/contrib/cmake/configure/configure_netcdf.cmake index d48aa9cfbf..e5254875a5 100644 --- a/deal.II/contrib/cmake/configure/configure_netcdf.cmake +++ b/deal.II/contrib/cmake/configure/configure_netcdf.cmake @@ -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}) diff --git a/deal.II/contrib/cmake/modules/FindAMD.cmake b/deal.II/contrib/cmake/modules/FindAMD.cmake index 9fb3b4aa9b..d8e96d8c40 100644 --- a/deal.II/contrib/cmake/modules/FindAMD.cmake +++ b/deal.II/contrib/cmake/modules/FindAMD.cmake @@ -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() diff --git a/deal.II/contrib/cmake/modules/FindNetcdf.cmake b/deal.II/contrib/cmake/modules/FindNetcdf.cmake index 7d0e238a79..8871b344ec 100644 --- a/deal.II/contrib/cmake/modules/FindNetcdf.cmake +++ b/deal.II/contrib/cmake/modules/FindNetcdf.cmake @@ -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() diff --git a/deal.II/contrib/cmake/modules/FindTBB.cmake b/deal.II/contrib/cmake/modules/FindTBB.cmake index fbea8a24b0..86535929e0 100644 --- a/deal.II/contrib/cmake/modules/FindTBB.cmake +++ b/deal.II/contrib/cmake/modules/FindTBB.cmake @@ -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() diff --git a/deal.II/contrib/cmake/modules/FindUmfpack.cmake b/deal.II/contrib/cmake/modules/FindUmfpack.cmake index 7d3c2a1bee..274ee62757 100644 --- a/deal.II/contrib/cmake/modules/FindUmfpack.cmake +++ b/deal.II/contrib/cmake/modules/FindUmfpack.cmake @@ -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() -- 2.39.5