From: maier Date: Tue, 11 Sep 2012 12:14:18 +0000 (+0000) Subject: Roundup... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d4d9f0d138a4999eeaf4783f777e9d69d6a93f4;p=dealii-svn.git Roundup... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26279 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 8a370e9381..dbb85ee40f 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -44,8 +44,8 @@ SET(DEAL_II_PATH ${CMAKE_INSTALL_PREFIX}) # #TODO: -SET(CMAKE_CXX_FLAGS "-std=c++0x -Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") #TODO: c++0x Features umschalten -SET(CMAKE_C_FLAGS "-Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") #TODO: c++0x Features umschalten +SET(CMAKE_CXX_FLAGS "-std=c++0x -Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") +SET(CMAKE_C_FLAGS "-Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." @@ -98,16 +98,10 @@ OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK # library can be compiled: ADD_CUSTOM_TARGET(deal_ii_target_dependencies) - - - -# -# Platform checks: -# - -INCLUDE(check_for_cxx_features) - -INCLUDE(check_for_compiler_bugs) +# used to keep track of external libraries and necessary linker flags +SET(deal_ii_external_libraries "") +SET(deal_ii_external_debug_libraries "") +SET(deal_ii_required_linker_flags "") @@ -129,6 +123,17 @@ ENDIF() +# +# Platform checks: +# + +INCLUDE(check_for_cxx_features) + +INCLUDE(check_for_compiler_bugs) + + + + # # Build the toolchain: # @@ -144,7 +149,7 @@ ADD_SUBDIRECTORY(common/expand_instantiations) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include/ - ${CMAKE_SOURCE_DIR}/contrib/ #TODO + # ${CMAKE_SOURCE_DIR}/contrib/ #TODO ${CMAKE_BINARY_DIR}/include/ ) @@ -153,3 +158,4 @@ INCLUDE(macro_expand_instantiations) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(source) + diff --git a/deal.II/contrib/cmake/modules/configure_threads.cmake b/deal.II/contrib/cmake/modules/configure_threads.cmake index 8787435f61..2ceb703e79 100644 --- a/deal.II/contrib/cmake/modules/configure_threads.cmake +++ b/deal.II/contrib/cmake/modules/configure_threads.cmake @@ -2,8 +2,7 @@ INCLUDE(CheckCXXSourceCompiles) FIND_PACKAGE(Threads REQUIRED) -# TODO: Necessary linker flags for threads? Or are they set automatically -# by the package? +LIST(APPEND deal_ii_required_flags ${CMAKE_THREAD_LIBS_INIT}) IF(DEAL_II_ALLOW_CONTRIB) FIND_PACKAGE(TBB) @@ -38,12 +37,12 @@ LIST(APPEND deal_ii_external_debug_libraries SET(DEAL_II_USE_MT TRUE) - IF(CMAKE_USE_PTHREADS_INIT) SET(DEAL_II_USE_MT_POSIX TRUE) # Check whether posix thread barriers are available: + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_THREAD_LIBS_INIT}") CHECK_CXX_SOURCE_COMPILES( " #include @@ -58,6 +57,8 @@ IF(CMAKE_USE_PTHREADS_INIT) " DEAL_II_HAVE_MT_POSIX_BARRIERS) + SET(CMAKE_REQUIRED_FLAGS "") + IF(NOT DEAL_II_HAVE_MT_POSIX_BARRIERS) SET(DEAL_II_USE_MT_POSIX_NO_BARRIERS TRUE) ENDIF() diff --git a/deal.II/contrib/cmake/modules/configure_umfpack.cmake b/deal.II/contrib/cmake/modules/configure_umfpack.cmake index 21eb6852af..b14e3a67d1 100644 --- a/deal.II/contrib/cmake/modules/configure_umfpack.cmake +++ b/deal.II/contrib/cmake/modules/configure_umfpack.cmake @@ -17,9 +17,6 @@ ENDIF() IF(DEAL_II_FORCE_CONTRIB_UMFPACK OR NOT UmfpackAMD_FOUND) - # - # Add umfpack and amd directly to the object files of deal.II - # INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Include @@ -29,12 +26,16 @@ IF(DEAL_II_FORCE_CONTRIB_UMFPACK OR NOT UmfpackAMD_FOUND) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source) + # + # Add umfpack and amd directly to the object files of deal.II + # LIST(APPEND deal_ii_additional_object_files ${obj_umfpack_object_files} $ $ $ ) + ELSE() INCLUDE_DIRECTORIES(${Umfpack_INCLUDE_DIR} ${AMD_INCLUDE_DIR})