From: maier Date: Sat, 9 Mar 2013 09:50:48 +0000 (+0000) Subject: Add missing information to report_features X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=808734e7dc66d852d02ff9a66a59e42215146db2;p=dealii-svn.git Add missing information to report_features git-svn-id: https://svn.dealii.org/trunk@28834 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/scripts/CMakeLists.txt b/deal.II/cmake/scripts/CMakeLists.txt index 80edae76c4..129e3b6342 100644 --- a/deal.II/cmake/scripts/CMakeLists.txt +++ b/deal.II/cmake/scripts/CMakeLists.txt @@ -19,7 +19,6 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) # Build and install the old dependency_resolution and report_features # executables: # - INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/include/ ${CMAKE_SOURCE_DIR}/include/ @@ -27,7 +26,18 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) ADD_EXECUTABLE(make_dependencies make_dependencies.cc) - ADD_EXECUTABLE(report_features report_features.cc) + IF(BUILD_SHARED_LIBS) + SET(_shared_libs "true") + ELSE() + SET(_shared_libs "false") + ENDIF() + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/report_features.cc.in + ${CMAKE_CURRENT_BINARY_DIR}/report_features.cc + ) + ADD_EXECUTABLE(report_features + ${CMAKE_CURRENT_BINARY_DIR}/report_features.cc + ) TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES}) ADD_CUSTOM_TARGET(run_report_features COMMAND report_features) diff --git a/deal.II/cmake/scripts/report_features.cc b/deal.II/cmake/scripts/report_features.cc.in similarity index 80% rename from deal.II/cmake/scripts/report_features.cc rename to deal.II/cmake/scripts/report_features.cc.in index 820e520f03..af2ab44e32 100644 --- a/deal.II/cmake/scripts/report_features.cc +++ b/deal.II/cmake/scripts/report_features.cc.in @@ -11,14 +11,12 @@ // //---------------------------------------------------------------------- -/* - * TODO: Implement a report line for Arpack, Boost and P4est - * - 2013, maier - */ #include #include +#include + #ifdef DEAL_II_WITH_UMFPACK extern "C" { #include @@ -55,16 +53,42 @@ extern "C" { int main() { + std::cout << "dealii-feature: target=" + << "@CMAKE_SYSTEM_NAME@" << std::endl; + std::cout << "dealii-feature: compiler=" + << "@CMAKE_CXX_COMPILER_ID@@CMAKE_CXX_COMPILER_VERSION@" + << std::endl; + if(${_shared_libs}) + std::cout << "dealii-feature: shared_libs=yes" << std::endl; + else + std::cout << "dealii-feature: shared_libs=yes" << std::endl; + +#ifdef DEAL_II_WITH_ARPACK + std::cout << "dealii-feature: ARPACK=yes" << std::endl; +#endif + +std::cout << "dealii-feature: BOOST=" + << BOOST_VERSION / 100000 << "." + << BOOST_VERSION / 100 % 1000 + << std::endl; + +#ifdef DEAL_II_WITH_FUNCTIONPARSER + std::cout << "dealii-feature: parser=yes" << std::endl; +#else + std::cout << "dealii-feature: parser=no" << std::endl; +#endif + +#ifdef DEAL_II_WITH_HDF5 + std::cout << "dealii-feature: HDF5=yes" << std::endl; +#endif + #ifdef DEAL_II_WITH_LAPACK std::cout << "dealii-feature: BLAS=yes" << std::endl; std::cout << "dealii-feature: LAPACK=yes" << std::endl; #endif -#ifdef DEAL_II_WITH_UMFPACK - std::cout << "dealii-feature: UMFPACK=" - << UMFPACK_MAIN_VERSION << '.' - << UMFPACK_SUB_VERSION << '.' - << UMFPACK_SUBSUB_VERSION << std::endl; +#ifdef DEAL_II_WITH_METIS + std::cout << "dealii-feature: METIS=yes" << std::endl; #endif #if defined(DEAL_II_WITH_MPI) @@ -80,29 +104,14 @@ int main() # endif #endif -#ifdef DEAL_II_WITH_THREADS - std::cout << "dealii-feature: multithreading=yes" << std::endl; -#else - std::cout << "dealii-feature: multithreading=no" << std::endl; -#endif - -#ifdef DEAL_II_WITH_TRILINOS -# ifdef TRILINOS_VERSION_STRING - std::cout << "dealii-feature: Trilinos=" << TRILINOS_VERSION_STRING << std::endl; -# else - const unsigned int trilinos_subminor = TRILINOS_MAJOR_MINOR_VERSION % 100; - const unsigned int trilinos_minor = (TRILINOS_MAJOR_MINOR_VERSION/100) % 100; - std::cout << "dealii-feature: Trilinos=" - << TRILINOS_MAJOR_VERSION << '.' - << trilinos_minor << '.' - << trilinos_subminor << std::endl; -# endif -#endif - #ifdef DEAL_II_WITH_MUMPS std::cout << "dealii-feature: MUMPS=yes" << std::endl; #endif +#ifdef DEAL_II_WITH_P4EST + std::cout << "dealii-feature: P4EST=yes" << std::endl; +#endif + #ifdef DEAL_II_WITH_PETSC std::cout << "dealii-feature: PETSc=" << PETSC_VERSION_MAJOR << '.' @@ -119,41 +128,46 @@ int main() << SLEPC_VERSION_PATCH << std::endl; #endif -#if defined(HAVE_HSL_MA27) || defined(HAVE_HSL_MA47) - std::cout << "dealii-feature: HSL="; -#ifdef HAVE_HSL_MA27 - std::cout << "MA27"; -#endif -#ifdef HAVE_HSL_MA47 - std::cout << "MA47"; -#endif - std::cout << std::endl; +#ifdef DEAL_II_WITH_NETCDF + std::cout << "dealii-feature: NetCDF=yes" << std::endl; #endif #ifdef DEAL_II_WITH_P4EST std::cout << "dealii-feature: P4est=yes" << std::endl; #endif -#ifdef DEAL_II_WITH_HDF5 - std::cout << "dealii-feature: HDF5=yes" << std::endl; +#ifdef DEAL_II_WITH_TECPLOT + std::cout << "dealii-feature: Tecplot=yes" << std::endl; #endif -#ifdef DEAL_II_HAVE_TECPLOT - std::cout << "dealii-feature: Tecplot=yes" << std::endl; +#ifdef DEAL_II_WITH_THREADS + std::cout << "dealii-feature: multithreading=yes" << std::endl; +#else + std::cout << "dealii-feature: multithreading=no" << std::endl; #endif - -#ifdef DEAL_II_WITH_NETCDF - std::cout << "dealii-feature: NetCDF=yes" << std::endl; + +#ifdef DEAL_II_WITH_TRILINOS +# ifdef TRILINOS_VERSION_STRING + std::cout << "dealii-feature: Trilinos=" << TRILINOS_VERSION_STRING << std::endl; +# else + const unsigned int trilinos_subminor = TRILINOS_MAJOR_MINOR_VERSION % 100; + const unsigned int trilinos_minor = (TRILINOS_MAJOR_MINOR_VERSION/100) % 100; + std::cout << "dealii-feature: Trilinos=" + << TRILINOS_MAJOR_VERSION << '.' + << trilinos_minor << '.' + << trilinos_subminor << std::endl; +# endif +#endif + +#ifdef DEAL_II_WITH_UMFPACK + std::cout << "dealii-feature: UMFPACK=" + << UMFPACK_MAIN_VERSION << '.' + << UMFPACK_SUB_VERSION << '.' + << UMFPACK_SUBSUB_VERSION << std::endl; #endif #ifdef DEAL_II_WITH_ZLIB std::cout << "dealii-feature: LibZ=yes" << std::endl; #endif -#ifdef DEAL_II_WITH_FUNCTIONPARSER - std::cout << "dealii-feature: parser=yes" << std::endl; -#else - std::cout << "dealii-feature: parser=no" << std::endl; -#endif - }