From: maier Date: Tue, 16 Jul 2013 10:06:51 +0000 (+0000) Subject: CMake: Unconditionally mark a lot of variables as adavanced even if the X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=472706ed8ba7d249ad9d141c3d30e905dc9b795b;p=dealii-svn.git CMake: Unconditionally mark a lot of variables as adavanced even if the corresponding library could not be found. git-svn-id: https://svn.dealii.org/trunk@30008 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_lapack.cmake b/deal.II/cmake/configure/configure_1_lapack.cmake index 7e614ac738..5e58e77b62 100644 --- a/deal.II/cmake/configure/configure_1_lapack.cmake +++ b/deal.II/cmake/configure/configure_1_lapack.cmake @@ -37,6 +37,18 @@ MACRO(FEATURE_LAPACK_FIND_EXTERNAL var) LIST(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES}) ENDIF() + MARK_AS_ADVANCED( + atlas_LIBRARY + blas_LIBRARY + gslcblas_LIBRARY + lapack_LIBRARY + m_LIBRARY + ptf77blas_LIBRARY + ptlapack_LIBRARY + refblas_LIBRARY + reflapack_LIBRARY + ) + IF(LAPACK_FOUND) # # Well, in case of static archives we have to manually pick up the @@ -63,17 +75,6 @@ MACRO(FEATURE_LAPACK_FIND_EXTERNAL var) ENDFOREACH() SWITCH_LIBRARY_PREFERENCE() - MARK_AS_ADVANCED( - atlas_LIBRARY - blas_LIBRARY - gslcblas_LIBRARY - lapack_LIBRARY - m_LIBRARY - ptf77blas_LIBRARY - ptlapack_LIBRARY - refblas_LIBRARY - reflapack_LIBRARY - ) SET(${var} TRUE) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/configure/configure_1_mpi.cmake b/deal.II/cmake/configure/configure_1_mpi.cmake index 7cf651990b..becf55d51c 100644 --- a/deal.II/cmake/configure/configure_1_mpi.cmake +++ b/deal.II/cmake/configure/configure_1_mpi.cmake @@ -85,10 +85,10 @@ MACRO(FEATURE_MPI_FIND_EXTERNAL var) ENDIF() ENDFOREACH() - IF(MPI_CXX_FOUND) - # Hide some variables: - MARK_AS_ADVANCED(MPI_EXTRA_LIBRARY MPI_LIBRARY) + # Hide some variables: + MARK_AS_ADVANCED(MPI_EXTRA_LIBRARY MPI_LIBRARY) + IF(MPI_CXX_FOUND) SET(${var} TRUE) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake index 5161e6ee59..28bcc10bb5 100644 --- a/deal.II/cmake/configure/configure_1_threads.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -196,10 +196,10 @@ MACRO(FEATURE_THREADS_CONFIGURE_BUNDLED) # # tbb uses dlopen/dlclose, so link against libdl.so as well: # - FIND_LIBRARY(dl_lib NAMES dl) - MARK_AS_ADVANCED(dl_lib) - IF(NOT dl_lib MATCHES "-NOTFOUND") - LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${dl_lib}) + FIND_LIBRARY(dl_LIBRARY NAMES dl) + MARK_AS_ADVANCED(dl_LIBRARY) + IF(NOT dl_LIBRARY MATCHES "-NOTFOUND") + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${dl_LIBRARY}) ENDIF() INCLUDE_DIRECTORIES(${TBB_FOLDER}/include) diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index 23bd875f55..f3ce34969f 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -61,12 +61,13 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var) FIND_PACKAGE(Boost 1.44 COMPONENTS ${_boost_components}) ENDIF() + MARK_AS_ADVANCED(Boost_DIR) + IF( Boost_SERIALIZATION_FOUND AND Boost_SYSTEM_FOUND AND (NOT DEAL_II_WITH_THREADS OR Boost_THREAD_FOUND) ) SET(${var} TRUE) - MARK_AS_ADVANCED(Boost_DIR) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/modules/FindARPACK.cmake b/deal.II/cmake/modules/FindARPACK.cmake index 47e75d3cf9..831c716806 100644 --- a/deal.II/cmake/modules/FindARPACK.cmake +++ b/deal.II/cmake/modules/FindARPACK.cmake @@ -46,6 +46,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(ARPACK DEFAULT_MSG LAPACK_FOUND ) +MARK_AS_ADVANCED( + lapack_LIBRARY + atlas_LIBRARY + blas_LIBRARY + ARPACK_LIBRARY + ) + IF(ARPACK_FOUND) SET(ARPACK_LIBRARIES ${ARPACK_LIBRARY} @@ -55,13 +62,7 @@ IF(ARPACK_FOUND) ${LAPACK_LINKER_FLAGS} ) - MARK_AS_ADVANCED( - lapack_LIBRARY - atlas_LIBRARY - blas_LIBRARY - ARPACK_LIBRARY - ARPACK_DIR - ) + MARK_AS_ADVANCED(ARPACK_DIR) ELSE() SET(ARPACK_DIR "" CACHE PATH "An optional hint to an ARPACK installation" diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index c5006ca792..d0a78b5c6f 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -55,6 +55,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(HDF5 DEFAULT_MSG HDF5_INCLUDE_DIR ) +MARK_AS_ADVANCED( + HDF5_LIBRARY + HDF5_HL_LIBRARY + HDF5_INCLUDE_DIR + ) + IF(HDF5_FOUND) SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR} @@ -76,12 +82,7 @@ IF(HDF5_FOUND) SET(HDF5_WITH_MPI TRUE) ENDIF() - MARK_AS_ADVANCED( - HDF5_DIR - HDF5_LIBRARY - HDF5_HL_LIBRARY - HDF5_INCLUDE_DIR - ) + MARK_AS_ADVANCED(HDF5_DIR) ELSE() SET(HDF5_DIR "" CACHE PATH "An optional hint to an hdf5 directory" diff --git a/deal.II/cmake/modules/FindMETIS.cmake b/deal.II/cmake/modules/FindMETIS.cmake index 634d82d462..e36a8719d2 100644 --- a/deal.II/cmake/modules/FindMETIS.cmake +++ b/deal.II/cmake/modules/FindMETIS.cmake @@ -64,6 +64,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(METIS DEFAULT_MSG METIS_INCLUDE_DIR ) +MARK_AS_ADVANCED( + METIS_LIBRARY + PARMETIS_LIBRARY + METIS_INCLUDE_DIR + ) + IF(METIS_FOUND) IF(NOT PARMETIS_LIBRARY MATCHES "-NOTFOUND") @@ -87,11 +93,7 @@ IF(METIS_FOUND) REGEX "METIS_VER_MINOR") STRING(REGEX REPLACE "^.*METIS_VER_MINOR.* ([0-9]+).*" "\\1" METIS_MINOR "${METIS_MINOR_STRING}") - MARK_AS_ADVANCED( - METIS_LIBRARY - METIS_INCLUDE_DIR - METIS_DIR - ) + MARK_AS_ADVANCED(METIS_DIR) ELSE() SET(METIS_DIR "" CACHE PATH "An optional hint to a metis directory" diff --git a/deal.II/cmake/modules/FindMUMPS.cmake b/deal.II/cmake/modules/FindMUMPS.cmake index 0a9d9a7fe0..0b895aa5fb 100644 --- a/deal.II/cmake/modules/FindMUMPS.cmake +++ b/deal.II/cmake/modules/FindMUMPS.cmake @@ -79,6 +79,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MUMPS DEFAULT_MSG SCALAPACK_FOUND ) +MARK_AS_ADVANCED( + DMUMPS_LIBRARY + MUMPS_COMMON_LIBRARY + MUMPS_INCLUDE_DIR + PORT_LIBRARY + ) + IF(MUMPS_FOUND) SET(MUMPS_INCLUDE_DIRS ${MUMPS_INCLUDE_DIR} @@ -95,12 +102,7 @@ IF(MUMPS_FOUND) ${SCALAPACK_LINKER_FLAGS} ) - MARK_AS_ADVANCED( - DMUMPS_LIBRARY - MUMPS_COMMON_LIBRARY - MUMPS_INCLUDE_DIR - PORT_LIBRARY - ) + MARK_AS_ADVANCED(MUMPS_DIR) ELSE() SET(MUMPS_DIR "" CACHE PATH "An optional hint to a mumps directory" diff --git a/deal.II/cmake/modules/FindNETCDF.cmake b/deal.II/cmake/modules/FindNETCDF.cmake index 0ae1cf535c..0b281c9027 100644 --- a/deal.II/cmake/modules/FindNETCDF.cmake +++ b/deal.II/cmake/modules/FindNETCDF.cmake @@ -61,6 +61,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETCDF DEFAULT_MSG NETCDF_INCLUDE_DIR ) +MARK_AS_ADVANCED( + NETCDF_CPLUSPLUS_LIBRARY + NETCDF_C_LIBRARY + NETCDF_INCLUDE_DIR + ) + IF(NETCDF_FOUND) SET(NETCDF_INCLUDE_DIRS ${NETCDF_INCLUDE_DIR} @@ -70,12 +76,7 @@ IF(NETCDF_FOUND) ${NETCDF_C_LIBRARY} ) - MARK_AS_ADVANCED( - NETCDF_CPLUSPLUS_LIBRARY - NETCDF_C_LIBRARY - NETCDF_INCLUDE_DIR - NETCDF_DIR - ) + MARK_AS_ADVANCED(NETCDF_DIR) ELSE() SET(NETCDF_DIR "" CACHE PATH "An optional hint to a NETCDF installation" diff --git a/deal.II/cmake/modules/FindP4EST.cmake b/deal.II/cmake/modules/FindP4EST.cmake index bdbb8ad4c2..2ccfbd9269 100644 --- a/deal.II/cmake/modules/FindP4EST.cmake +++ b/deal.II/cmake/modules/FindP4EST.cmake @@ -89,6 +89,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(P4EST DEFAULT_MSG SC_INCLUDE_DIR ) +MARK_AS_ADVANCED( + P4EST_LIBRARY + P4EST_INCLUDE_DIR + SC_LIBRARY + SC_INCLUDE_DIR + ) + IF(P4EST_FOUND) SET(P4EST_LIBRARIES ${P4EST_LIBRARY} @@ -112,13 +119,7 @@ IF(P4EST_FOUND) SET(P4EST_WITH_MPI TRUE) ENDIF() - MARK_AS_ADVANCED( - P4EST_DIR - P4EST_LIBRARY - P4EST_INCLUDE_DIR - SC_LIBRARY - SC_INCLUDE_DIR - ) + MARK_AS_ADVANCED(P4EST_DIR) ELSE() SET(P4EST_DIR "" CACHE PATH "An optional hint to a p4est installation/directory" diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake index 7e5f448054..bdb81b6942 100644 --- a/deal.II/cmake/modules/FindPETSC.cmake +++ b/deal.II/cmake/modules/FindPETSC.cmake @@ -130,6 +130,14 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PETSC DEFAULT_MSG PETSC_INCLUDE_DIR_COMMON ) +MARK_AS_ADVANCED( + PETSC_INCLUDE_DIR_ARCH + PETSC_INCLUDE_DIR_COMMON + PETSC_INCLUDE_DIRS + PETSC_LIBRARY + PETSC_PETSCVARIABLES + ) + IF(PETSC_FOUND) SET(PETSC_LIBRARIES ${PETSC_LIBRARY} @@ -191,15 +199,7 @@ IF(PETSC_FOUND) SET(PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}") - MARK_AS_ADVANCED( - PETSC_ARCH - PETSC_DIR - PETSC_INCLUDE_DIR_ARCH - PETSC_INCLUDE_DIR_COMMON - PETSC_INCLUDE_DIRS - PETSC_LIBRARY - PETSC_PETSCVARIABLES - ) + MARK_AS_ADVANCED(PETSC_ARCH PETSC_DIR) ELSE() SET(PETSC_DIR "" CACHE PATH "An optional hint to a PETSc directory" diff --git a/deal.II/cmake/modules/FindSCALAPACK.cmake b/deal.II/cmake/modules/FindSCALAPACK.cmake index 16a1d13cd6..7dca21d960 100644 --- a/deal.II/cmake/modules/FindSCALAPACK.cmake +++ b/deal.II/cmake/modules/FindSCALAPACK.cmake @@ -71,6 +71,16 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SCALAPACK DEFAULT_MSG LAPACK_FOUND ) +MARK_AS_ADVANCED( + lapack_LIBRARY + atlas_LIBRARY + blas_LIBRARY + SCALAPACK_LIBRARY + BLACS_LIBRARY + BLACSCINIT_LIBRARY + BLACSF77INIT_LIBRARY + ) + IF(SCALAPACK_FOUND) SET(SCALAPACK_LIBRARIES ${SCALAPACK_LIBRARY} @@ -82,17 +92,7 @@ IF(SCALAPACK_FOUND) ${LAPACK_LINKER_FLAGS} ) - MARK_AS_ADVANCED( - lapack_LIBRARY - atlas_LIBRARY - blas_LIBRARY - SCALAPACK_DIR - SCALAPACK_LIBRARY - BLACS_DIR - BLACS_LIBRARY - BLACSCINIT_LIBRARY - BLACSF77INIT_LIBRARY - ) + MARK_AS_ADVANCED(SCALAPACK_DIR BLACS_DIR) ELSE() SET(SCALAPACK_DIR "" CACHE PATH "An optional hint to a SCALAPACK directory" diff --git a/deal.II/cmake/modules/FindSLEPC.cmake b/deal.II/cmake/modules/FindSLEPC.cmake index b4c5c04676..8af1b5349d 100644 --- a/deal.II/cmake/modules/FindSLEPC.cmake +++ b/deal.II/cmake/modules/FindSLEPC.cmake @@ -75,6 +75,14 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SLEPC DEFAULT_MSG PETSC_FOUND ) +MARK_AS_ADVANCED( + SLEPC_DIR + SLEPC_INCLUDE_DIR_ARCH + SLEPC_INCLUDE_DIR_COMMON + SLEPC_INCLUDE_DIRS + SLEPC_LIBRARY + ) + IF(SLEPC_FOUND) SET(SLEPC_INCLUDE_DIRS ${SLEPC_INCLUDE_DIR_ARCH} @@ -113,13 +121,7 @@ IF(SLEPC_FOUND) SET(SLEPC_VERSION "${SLEPC_VERSION_MAJOR}.${SLEPC_VERSION_MINOR}.${SLEPC_VERSION_SUBMINOR}") - MARK_AS_ADVANCED( - SLEPC_DIR - SLEPC_INCLUDE_DIR_ARCH - SLEPC_INCLUDE_DIR_COMMON - SLEPC_INCLUDE_DIRS - SLEPC_LIBRARY - ) + MARK_AS_ADVANCED(SLEPC_DIR) ELSE() SET(SLEPC_DIR "" CACHE PATH "An optional hint to a SLEPC directory" diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake index b3bc3ad288..7a235e9e87 100644 --- a/deal.II/cmake/modules/FindTBB.cmake +++ b/deal.II/cmake/modules/FindTBB.cmake @@ -57,8 +57,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG 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) IF(NOT TBB_DEBUG_LIBRARY MATCHES "-NOTFOUND") SET(TBB_WITH_DEBUGLIB TRUE) @@ -69,8 +74,8 @@ IF(TBB_FOUND) SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR}) + MARK_AS_ADVANCED(TBB_DIR) ELSE() - SET(TBB_DIR "" CACHE PATH "An optional hint to a TBB installation" ) diff --git a/deal.II/cmake/modules/FindTRILINOS.cmake b/deal.II/cmake/modules/FindTRILINOS.cmake index b9bbe6f0ef..19e604e70b 100644 --- a/deal.II/cmake/modules/FindTRILINOS.cmake +++ b/deal.II/cmake/modules/FindTRILINOS.cmake @@ -89,6 +89,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TRILINOS DEFAULT_MSG TRILINOS_CONFIG_FOUND ) +MARK_AS_ADVANCED(TRILINOS_CONFIG_DIR) + IF(TRILINOS_FOUND) # @@ -142,13 +144,8 @@ IF(TRILINOS_FOUND) UNSET(EPETRA_CONFIG_H CACHE) - MARK_AS_ADVANCED( - TRILINOS_DIR - TRILINOS_CONFIG_DIR - ) - + MARK_AS_ADVANCED(TRILINOS_DIR) ELSE() - SET(TRILINOS_DIR "" CACHE PATH "An optional hint to a Trilinos installation" ) diff --git a/deal.II/cmake/modules/FindUMFPACK.cmake b/deal.II/cmake/modules/FindUMFPACK.cmake index 68f418bf42..be89fe3eb5 100644 --- a/deal.II/cmake/modules/FindUMFPACK.cmake +++ b/deal.II/cmake/modules/FindUMFPACK.cmake @@ -119,6 +119,21 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(UMFPACK DEFAULT_MSG LAPACK_FOUND ) +MARK_AS_ADVANCED( + AMD_INCLUDE_DIR + AMD_LIBRARY + atlas_LIBRARY + blas_LIBRARY + CAMD_LIBRARY + CHOLMOD_LIBRARY + CCOLAMD_LIBRARY + COLAMD_LIBRARY + SuiteSparse_config_INCLUDE_DIR + SuiteSparse_config_LIBRARY + UMFPACK_INCLUDE_DIR + UMFPACK_LIBRARY + ) + IF(UMFPACK_FOUND) SET(UMFPACK_LIBRARIES @@ -163,22 +178,7 @@ IF(UMFPACK_FOUND) ${LAPACK_LINKER_FLAGS} ) - MARK_AS_ADVANCED( - AMD_INCLUDE_DIR - AMD_LIBRARY - atlas_LIBRARY - blas_LIBRARY - CAMD_LIBRARY - CHOLMOD_LIBRARY - CCOLAMD_LIBRARY - COLAMD_LIBRARY - SuiteSparse_config_INCLUDE_DIR - SuiteSparse_config_LIBRARY - SUITESPARSE_DIR - UMFPACK_DIR - UMFPACK_INCLUDE_DIR - UMFPACK_LIBRARY - ) + MARK_AS_ADVANCED(UMFPACK_DIR SUITESPARSE_DIR) ELSE() SET(UMFPACK_DIR "" CACHE PATH "An optional hint to an UMFPACK directory"