]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Refactoring
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 07:49:55 +0000 (07:49 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 07:49:55 +0000 (07:49 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26704 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_1_tbb.cmake
deal.II/cmake/configure/configure_functionparser.cmake
deal.II/cmake/configure/configure_umfpack.cmake

index 1216f2aadbcc75aa54b8aec50e7bf41401498170..fce0ccc588eea238b462076012254553dea81029 100644 (file)
@@ -151,11 +151,11 @@ MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var)
       )
   ENDIF()
 
-  INCLUDE_DIRECTORIES(
-    ${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/include
-    )
+  SET(tbb_folder "${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss")
 
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss/src)
+  INCLUDE_DIRECTORIES(${tbb_folder}/include)
+
+  ADD_SUBDIRECTORY(${tbb_folder}/src)
 
 ENDMACRO()
 
index 9f226cd57e8e3fe4aaadc98b2f7e452d33c5ad48..2b781e2f6674a052420ced319a060e18aca3fba0 100644 (file)
@@ -17,18 +17,14 @@ MACRO(FEATURE_FUNCTIONPARSER_CONFIGURE_CONTRIB var)
   # compile the necessary parts of functionparser out of ./contrib
   #
 
-  INCLUDE_DIRECTORIES(
-    ${CMAKE_SOURCE_DIR}/contrib/functionparser/
-    )
+  SET(functionparser_folder "${CMAKE_SOURCE_DIR}/contrib/functionparser/")
 
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/functionparser)
+  INCLUDE_DIRECTORIES(${functionparser_folder})
 
   #
   # Add functionparser directly to the object files of deal.II
   #
-  LIST(APPEND deal_ii_additional_object_files
-    $<TARGET_OBJECTS:obj_functionparser>
-    )
+  ADD_SUBDIRECTORY(${functionparser_folder})
 
   SET(HAVE_FUNCTIONPARSER TRUE)
 
index 24e7e9e225387b3f6bb25c2d278a6494eaf10d31..8dbb073ed46258bd8eb4270801a21b89dc233add 100644 (file)
@@ -40,13 +40,15 @@ MACRO(FEATURE_UMFPACK_CONFIGURE_CONTRIB var)
   # Add umfpack and amd directly to the object files of deal.II
   #
 
+  SET(umfpack_folder "${CMAKE_SOURCE_DIR}/contrib/umfpack")
+
   INCLUDE_DIRECTORIES(
-    ${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Include
-    ${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Include
+    ${umfpack_folder}/UMFPACK/Include
+    ${umfpack_folder}/AMD/Include
     )
 
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source)
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source)
+  ADD_SUBDIRECTORY(${umfpack_folder}/UMFPACK/Source)
+  ADD_SUBDIRECTORY(${umfpack_folder}/AMD/Source)
 
   SET(HAVE_LIBUMFPACK TRUE)
 

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.