From: maier Date: Sun, 12 Aug 2012 13:22:32 +0000 (+0000) Subject: Replace SET(foo ${foo} ..) by LIST(APPEND foo ..) X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=817afe617533f08a7f9caac00a0345f91c7411c4;p=dealii-svn.git Replace SET(foo ${foo} ..) by LIST(APPEND foo ..) git-svn-id: https://svn.dealii.org/branches/branch_cmake@25905 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/modules/prepare_boost.cmake b/deal.II/contrib/cmake/modules/prepare_boost.cmake index 3168e6de5c..cd942493e8 100644 --- a/deal.II/contrib/cmake/modules/prepare_boost.cmake +++ b/deal.II/contrib/cmake/modules/prepare_boost.cmake @@ -3,14 +3,12 @@ IF(NOT DEAL_II_USE_CONTRIB) INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIR}) - SET(deal_ii_external_libraries - ${deal_ii_external_libraries} + LIST(APPEND deal_ii_external_libraries ${Boost_THREAD_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ) - SET(deal_ii_external_debug_libraries - ${deal_ii_external_debug_libraries} + LIST(APPEND deal_ii_external_debug_libraries ${Boost_THREAD_LIBRARY_DEBUG} ${Boost_SERIALIZATION_LIBRARY_DEBUG} - ) #TODO + ) SET(DEAL_II_USE_EXTERNAL_BOOST TRUE) ENDIF() diff --git a/deal.II/contrib/cmake/modules/prepare_threads.cmake b/deal.II/contrib/cmake/modules/prepare_threads.cmake index 8056e5bddd..5e0c1e8ed0 100644 --- a/deal.II/contrib/cmake/modules/prepare_threads.cmake +++ b/deal.II/contrib/cmake/modules/prepare_threads.cmake @@ -14,18 +14,15 @@ ENDIF() INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIR}) IF(NOT DEAL_II_USE_CONTRIB) - SET(deal_ii_include_paths - ${deal_ii_include_paths} + LIST(APPEND deal_ii_include_paths ${TBB_INCLUDE_DIR} ) ENDIF() -SET(deal_ii_external_libraries - ${deal_ii_external_libraries} +LIST(APPEND deal_ii_external_libraries ${TBB_LIBRARY} ) -SET(deal_ii_external_debug_libraries - ${deal_ii_external_debug_libraries} +LIST(APPEND deal_ii_external_debug_libraries ${TBB_DEBUG_LIBRARY} ) #TODO diff --git a/deal.II/contrib/cmake/modules/prepare_umfpack.cmake b/deal.II/contrib/cmake/modules/prepare_umfpack.cmake index 8fd60cf01d..0b0a3b0c5b 100644 --- a/deal.II/contrib/cmake/modules/prepare_umfpack.cmake +++ b/deal.II/contrib/cmake/modules/prepare_umfpack.cmake @@ -14,8 +14,7 @@ IF(DEAL_II_USE_CONTRIB) ${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Include ) - SET(deal_ii_additional_object_files - ${deal_ii_additional_object_files} + LIST(APPEND deal_ii_additional_object_files $ $ ) @@ -30,13 +29,11 @@ ELSE() # deal.II library # - SET(deal_ii_external_libraries - ${deal_ii_external_libraries} + LIST(APPEND deal_ii_external_libraries ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ) - SET(deal_ii_external_debug_libraries - ${deal_ii_external_debug_libraries} + LIST(APPEND deal_ii_external_debug_libraries ${Umfpack_LIBRARY} ${AMD_LIBRARY} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ) ENDIF() diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 2060862131..b9d3d6dc78 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -20,5 +20,3 @@ ADD_LIBRARY(deal_II SHARED $ ${deal_ii_additional_object_files} ) - - message( "${deal_ii_additional_object_files}" )