)
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()
# 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)
# 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