From: Matthias Maier Date: Tue, 25 Sep 2012 07:49:55 +0000 (+0000) Subject: Refactoring X-Git-Tag: v8.0.0~1079^2~667 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f662365230af2ed32c4a5d32f75c9f0f0d31e40;p=dealii.git Refactoring git-svn-id: https://svn.dealii.org/branches/branch_cmake@26704 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_tbb.cmake b/deal.II/cmake/configure/configure_1_tbb.cmake index 1216f2aadb..fce0ccc588 100644 --- a/deal.II/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/cmake/configure/configure_1_tbb.cmake @@ -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() diff --git a/deal.II/cmake/configure/configure_functionparser.cmake b/deal.II/cmake/configure/configure_functionparser.cmake index 9f226cd57e..2b781e2f66 100644 --- a/deal.II/cmake/configure/configure_functionparser.cmake +++ b/deal.II/cmake/configure/configure_functionparser.cmake @@ -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 - $ - ) + ADD_SUBDIRECTORY(${functionparser_folder}) SET(HAVE_FUNCTIONPARSER TRUE) diff --git a/deal.II/cmake/configure/configure_umfpack.cmake b/deal.II/cmake/configure/configure_umfpack.cmake index 24e7e9e225..8dbb073ed4 100644 --- a/deal.II/cmake/configure/configure_umfpack.cmake +++ b/deal.II/cmake/configure/configure_umfpack.cmake @@ -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)