From 78e8994546fe1a0b34060629ff65c45807722e38 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 21 Sep 2012 10:21:18 +0000 Subject: [PATCH] Write deal_ii_external_libraries in uppercase git-svn-id: https://svn.dealii.org/branches/branch_cmake@26586 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 11 ++++++----- deal.II/contrib/cmake/configure/configure_1_mpi.cmake | 2 +- deal.II/contrib/cmake/configure/configure_1_tbb.cmake | 6 +++--- .../contrib/cmake/configure/configure_arpack.cmake | 2 +- deal.II/contrib/cmake/configure/configure_blas.cmake | 2 +- deal.II/contrib/cmake/configure/configure_boost.cmake | 4 ++-- .../contrib/cmake/configure/configure_lapack.cmake | 2 +- deal.II/contrib/cmake/configure/configure_metis.cmake | 2 +- .../contrib/cmake/configure/configure_netcdf.cmake | 2 +- deal.II/contrib/cmake/configure/configure_p4est.cmake | 6 +++--- .../contrib/cmake/configure/configure_trilinos.cmake | 2 +- .../contrib/cmake/configure/configure_umfpack.cmake | 2 +- deal.II/contrib/cmake/configure/configure_zlib.cmake | 2 +- deal.II/scripts/CMakeLists.txt | 2 +- 14 files changed, 24 insertions(+), 23 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 137bc1bded..714a682084 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -283,9 +283,9 @@ INCLUDE(setup_deal_ii) INCLUDE(setup_compiler_flags) -# #################### -# # FAT NOTE: # -# #################### +########################################################################### +# +# FAT NOTE: # # To keep things clean, only the following cmake variables should be # altered in the platform checks and features configuration @@ -300,14 +300,14 @@ INCLUDE(setup_compiler_flags) # for setting necessary compiler flags, e.g. -std=c++11 (if # available). # - ADD_CUSTOM_TARGET(deal_ii_target_dependencies) +ADD_CUSTOM_TARGET(deal_ii_target_dependencies) # Used as a dummy target for all the stuff that has to be done # before the library can be compiled. # # # For internal and external use: # - SET(deal_ii_external_libraries) +SET( DEAL_II_EXTERNAL_LIBRARIES) # Used to keep track of external libraries, the deal.II library and # user programs have to be linked against. # @@ -318,6 +318,7 @@ INCLUDE(setup_compiler_flags) # Used to keep track of external include dirs, necessary for the # compilation of user programs. # +########################################################################### # diff --git a/deal.II/contrib/cmake/configure/configure_1_mpi.cmake b/deal.II/contrib/cmake/configure/configure_1_mpi.cmake index 0f7f165c37..2ec0c64d68 100644 --- a/deal.II/contrib/cmake/configure/configure_1_mpi.cmake +++ b/deal.II/contrib/cmake/configure/configure_1_mpi.cmake @@ -16,7 +16,7 @@ MACRO(FEATURE_MPI_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH}) ADD_FLAGS(CMAKE_CXX_FLAGS "${MPI_CXX_COMPILE_FLAGS}") ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}") - LIST(APPEND deal_ii_external_libraries ${MPI_CXX_LIBRARIES}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${MPI_CXX_LIBRARIES}) SET(DEAL_II_COMPILER_SUPPORTS_MPI TRUE) diff --git a/deal.II/contrib/cmake/configure/configure_1_tbb.cmake b/deal.II/contrib/cmake/configure/configure_1_tbb.cmake index 0f8c80f89a..9baded21fb 100644 --- a/deal.II/contrib/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/contrib/cmake/configure/configure_1_tbb.cmake @@ -95,17 +95,17 @@ MACRO(FEATURE_TBB_CONFIGURE_EXTERNAL var) IF (CMAKE_BUILD_TYPE MATCHES "Debug") IF(TBB_DEBUG_FOUND) - LIST(APPEND deal_ii_external_libraries ${TBB_DEBUG_LIBRARY}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TBB_DEBUG_LIBRARY}) ELSE() MESSAGE(WARNING "\n" "deal.II was configured with CMAKE_BUILD_TYPE=Debug but no debug tbb\n" "library was found. The regular tbb library will be used instead.\n\n" ) - LIST(APPEND deal_ii_external_libraries ${TBB_LIBRARY}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TBB_LIBRARY}) ENDIF() ELSE() - LIST(APPEND deal_ii_external_libraries ${TBB_LIBRARY}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TBB_LIBRARY}) ENDIF() # Setup threading and if successfull return TRUE: diff --git a/deal.II/contrib/cmake/configure/configure_arpack.cmake b/deal.II/contrib/cmake/configure/configure_arpack.cmake index b08baa0455..537d83bc9b 100644 --- a/deal.II/contrib/cmake/configure/configure_arpack.cmake +++ b/deal.II/contrib/cmake/configure/configure_arpack.cmake @@ -13,7 +13,7 @@ ENDMACRO() MACRO(FEATURE_ARPACK_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${ARPACK_INCLUDE_DIR}) - LIST(APPEND deal_ii_external_libraries ${ARPACK_LIBRARY}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ARPACK_LIBRARY}) SET(DEAL_II_USE_ARPACK TRUE) diff --git a/deal.II/contrib/cmake/configure/configure_blas.cmake b/deal.II/contrib/cmake/configure/configure_blas.cmake index 395d1dfaf7..31374c3c00 100644 --- a/deal.II/contrib/cmake/configure/configure_blas.cmake +++ b/deal.II/contrib/cmake/configure/configure_blas.cmake @@ -14,7 +14,7 @@ ENDMACRO() MACRO(FEATURE_BLAS_CONFIGURE_EXTERNAL var) ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${BLAS_LINKER_FLAGS}") - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${BLAS_LIBRARIES} ) diff --git a/deal.II/contrib/cmake/configure/configure_boost.cmake b/deal.II/contrib/cmake/configure/configure_boost.cmake index a5f2ae7e9a..1c8e8f3881 100644 --- a/deal.II/contrib/cmake/configure/configure_boost.cmake +++ b/deal.II/contrib/cmake/configure/configure_boost.cmake @@ -33,11 +33,11 @@ MACRO(FEATURE_BOOST_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIR}) IF (CMAKE_BUILD_TYPE MATCHES "Debug") - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${Boost_THREAD_LIBRARY_DEBUG} ${Boost_SERIALIZATION_LIBRARY_DEBUG} ) ELSE() - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${Boost_THREAD_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ) ENDIF() diff --git a/deal.II/contrib/cmake/configure/configure_lapack.cmake b/deal.II/contrib/cmake/configure/configure_lapack.cmake index 10e8c00616..3c75f872ec 100644 --- a/deal.II/contrib/cmake/configure/configure_lapack.cmake +++ b/deal.II/contrib/cmake/configure/configure_lapack.cmake @@ -15,7 +15,7 @@ MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL var) ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}") - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${LAPACK_LIBRARIES} ) diff --git a/deal.II/contrib/cmake/configure/configure_metis.cmake b/deal.II/contrib/cmake/configure/configure_metis.cmake index e05b34fe8d..a813cf1164 100644 --- a/deal.II/contrib/cmake/configure/configure_metis.cmake +++ b/deal.II/contrib/cmake/configure/configure_metis.cmake @@ -18,7 +18,7 @@ ENDMACRO() MACRO(FEATURE_METIS_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIR}) - LIST(APPEND deal_ii_external_libraries ${METIS_LIBRARY}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${METIS_LIBRARY}) SET(DEAL_II_USE_METIS TRUE) diff --git a/deal.II/contrib/cmake/configure/configure_netcdf.cmake b/deal.II/contrib/cmake/configure/configure_netcdf.cmake index 4aa284fc05..6dcc526064 100644 --- a/deal.II/contrib/cmake/configure/configure_netcdf.cmake +++ b/deal.II/contrib/cmake/configure/configure_netcdf.cmake @@ -13,7 +13,7 @@ ENDMACRO() MACRO(FEATURE_NETCDF_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${NETCDF_INCLUDE_DIR}) - LIST(APPEND deal_ii_external_libraries ${NETCDF_LIBRARY}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${NETCDF_LIBRARY}) SET(HAVE_LIBNETCDF TRUE) SET(${var} TRUE) diff --git a/deal.II/contrib/cmake/configure/configure_p4est.cmake b/deal.II/contrib/cmake/configure/configure_p4est.cmake index d296c28ff1..471e8e4b9f 100644 --- a/deal.II/contrib/cmake/configure/configure_p4est.cmake +++ b/deal.II/contrib/cmake/configure/configure_p4est.cmake @@ -48,7 +48,7 @@ MACRO(FEATURE_P4EST_CONFIGURE_EXTERNAL var) IF (CMAKE_BUILD_TYPE MATCHES "Debug") IF(P4EST_DEBUG_FOUND AND SC_DEBUG_FOUND) - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${P4EST_DEBUG_LIBRARY} ${SC_DEBUG_LIBRARY} ) ELSE() @@ -57,12 +57,12 @@ MACRO(FEATURE_P4EST_CONFIGURE_EXTERNAL var) "sc libraries were found. The regular p4est and sc libraries will be used\n" "instead.\n\n" ) - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${P4EST_LIBRARY} ${SC_LIBRARY} ) ENDIF() ELSE() - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${P4EST_LIBRARY} ${SC_LIBRARY} ) ENDIF() diff --git a/deal.II/contrib/cmake/configure/configure_trilinos.cmake b/deal.II/contrib/cmake/configure/configure_trilinos.cmake index ea8d0239bd..bd710f492b 100644 --- a/deal.II/contrib/cmake/configure/configure_trilinos.cmake +++ b/deal.II/contrib/cmake/configure/configure_trilinos.cmake @@ -144,7 +144,7 @@ ENDMACRO() MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${TRILINOS_INCLUDE_DIR}) - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TRILINOS_LIBRARIES} ${Trilinos_TPL_LIBRARIES} ) diff --git a/deal.II/contrib/cmake/configure/configure_umfpack.cmake b/deal.II/contrib/cmake/configure/configure_umfpack.cmake index 34b8ee1df4..563ca12681 100644 --- a/deal.II/contrib/cmake/configure/configure_umfpack.cmake +++ b/deal.II/contrib/cmake/configure/configure_umfpack.cmake @@ -22,7 +22,7 @@ ENDMACRO() MACRO(FEATURE_UMFPACK_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${UMFPACK_INCLUDE_DIR} ${AMD_INCLUDE_DIR}) - LIST(APPEND deal_ii_external_libraries + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${UMFPACK_LIBRARY} ${AMD_LIBRARY} ) diff --git a/deal.II/contrib/cmake/configure/configure_zlib.cmake b/deal.II/contrib/cmake/configure/configure_zlib.cmake index 1221050628..f0e4f3f81b 100644 --- a/deal.II/contrib/cmake/configure/configure_zlib.cmake +++ b/deal.II/contrib/cmake/configure/configure_zlib.cmake @@ -13,7 +13,7 @@ ENDMACRO() MACRO(FEATURE_ZLIB_CONFIGURE_EXTERNAL var) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) - LIST(APPEND deal_ii_external_libraries ${ZLIB_LIBRARIES}) + LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ZLIB_LIBRARIES}) SET(HAVE_LIBZ TRUE) SET(${var} TRUE) diff --git a/deal.II/scripts/CMakeLists.txt b/deal.II/scripts/CMakeLists.txt index d504ca9d75..213228092d 100644 --- a/deal.II/scripts/CMakeLists.txt +++ b/deal.II/scripts/CMakeLists.txt @@ -12,7 +12,7 @@ IF(DEAL_II_INSTALL_COMPAT_FILES) ADD_EXECUTABLE(make_dependencies make_dependencies.cc) ADD_EXECUTABLE(report_features report_features.cc) - TARGET_LINK_LIBRARIES(report_features ${deal_ii_external_libraries}) + TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES}) ADD_DEPENDENCIES(report_features deal_ii_target_dependencies) -- 2.39.5