]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Replace SET(foo ${foo} ..) by LIST(APPEND foo ..)
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 12 Aug 2012 13:22:32 +0000 (13:22 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 12 Aug 2012 13:22:32 +0000 (13:22 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25905 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/modules/prepare_boost.cmake
deal.II/contrib/cmake/modules/prepare_threads.cmake
deal.II/contrib/cmake/modules/prepare_umfpack.cmake
deal.II/source/CMakeLists.txt

index 3168e6de5cc2abfb0fed058108f05254cc9e9ac3..cd942493e8e39c66d41e3d743103c007db6acfdb 100644 (file)
@@ -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()
index 8056e5bddd4761bbff117282d495ddca3706d514..5e0c1e8ed0b5fdcd76373cfce9bb3034fb15080c 100644 (file)
@@ -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
 
index 8fd60cf01d02a4c42c0db5bb39c755f944952f74..0b0a3b0c5bdb8f1f1a743c1bd863acacc2f11856 100644 (file)
@@ -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
     $<TARGET_OBJECTS:obj_umfpack>
     $<TARGET_OBJECTS:obj_amd>
     )
@@ -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()
index 2060862131f6be38a4e0331440dd941c74c5b0f5..b9d3d6dc78b846d1a391775c7685fddec21bcdcc 100644 (file)
@@ -20,5 +20,3 @@ ADD_LIBRARY(deal_II SHARED
  $<TARGET_OBJECTS:obj_numerics>
  ${deal_ii_additional_object_files}
  )
-
- message( "${deal_ii_additional_object_files}" )

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.