From 4b67b91003392920682c1d514150d8322851666f Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 17 Sep 2012 22:24:16 +0000 Subject: [PATCH] Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@26459 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 3 +-- deal.II/contrib/cmake/configure/configure_umfpack.cmake | 6 ++++++ .../{configure_boost.cmake => configure_zzzz_boost.cmake} | 0 3 files changed, 7 insertions(+), 2 deletions(-) rename deal.II/contrib/cmake/configure/{configure_boost.cmake => configure_zzzz_boost.cmake} (100%) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 25a329e300..a3e0458d78 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -253,9 +253,8 @@ ENDFOREACH() # FILE(GLOB configure_files "contrib/cmake/configure/configure_*.cmake") -# Make sure configure_boost.cmake comes after configure_tbb.cmake: +# Make sure the configure_*.cmake files are included in alphabetical order: LIST(SORT configure_files) -LIST(REVERSE configure_files) # :-] FOREACH(file ${configure_files}) MESSAGE(STATUS "Include ${file}") diff --git a/deal.II/contrib/cmake/configure/configure_umfpack.cmake b/deal.II/contrib/cmake/configure/configure_umfpack.cmake index 9e44d83640..4d0fc723f9 100644 --- a/deal.II/contrib/cmake/configure/configure_umfpack.cmake +++ b/deal.II/contrib/cmake/configure/configure_umfpack.cmake @@ -8,6 +8,12 @@ SET(FEATURE_UMFPACK_DEPENDS DEAL_II_WITH_LAPACK ) +# +# This configure script has to be included after configure_blas and +# configure_lapack. +# +# TODO: Write a check for this + MACRO(FEATURE_UMFPACK_FIND_EXTERNAL var) diff --git a/deal.II/contrib/cmake/configure/configure_boost.cmake b/deal.II/contrib/cmake/configure/configure_zzzz_boost.cmake similarity index 100% rename from deal.II/contrib/cmake/configure/configure_boost.cmake rename to deal.II/contrib/cmake/configure/configure_zzzz_boost.cmake -- 2.39.5