From: maier Date: Wed, 12 Sep 2012 18:56:38 +0000 (+0000) Subject: Update X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=131281cf9f83cb7441b581d852a2c45db5c61e88;p=dealii-svn.git Update git-svn-id: https://svn.dealii.org/branches/branch_cmake@26324 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index c5c468f777..442387c99b 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -149,10 +149,6 @@ SET(DEAL_II_PATH ${CMAKE_INSTALL_PREFIX}) -#TODO: -SET(CMAKE_CXX_FLAGS "-Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") -SET(CMAKE_C_FLAGS "-Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") - # # Now, configure a lot of things: @@ -174,6 +170,8 @@ SET(deal_ii_required_linker_flags "") # Feature configuration: # +INCLUDE(configure_compiler_flags) + INCLUDE(configure_boost) IF(DEAL_II_WITH_FUNCTIONPARSER) diff --git a/deal.II/contrib/cmake/configure/configure_boost.cmake b/deal.II/contrib/cmake/configure/configure_boost.cmake index f48d37a163..c066e3019d 100644 --- a/deal.II/contrib/cmake/configure/configure_boost.cmake +++ b/deal.II/contrib/cmake/configure/configure_boost.cmake @@ -22,7 +22,10 @@ IF(NOT DEAL_II_FORCE_CONTRIB_BOOST) SET(DEAL_II_USE_EXTERNAL_BOOST TRUE) ENDIF() -ENDIF() +ELSE() + + # compile the necessary parts of boost out of ./contrib -# ELSE() nothing to do. We compile the necessary boost source files -# directly if DEAL_II_USE_EXTERNAL_BOOST is not set. + ADD_DEFINITIONS("-DBOOST_NO_HASH" "-DBOOST_NO_SLIST") + +ENDIF() diff --git a/deal.II/contrib/cmake/configure/configure_compiler_flags.cmake b/deal.II/contrib/cmake/configure/configure_compiler_flags.cmake new file mode 100644 index 0000000000..dc87f53d34 --- /dev/null +++ b/deal.II/contrib/cmake/configure/configure_compiler_flags.cmake @@ -0,0 +1,4 @@ +#TODO: +SET(CMAKE_CXX_FLAGS "-Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") +SET(CMAKE_C_FLAGS "-Wfatal-errors -D_REENTRANT -fPIC -O2 -march=native") + diff --git a/deal.II/contrib/cmake/configure/configure_threads.cmake b/deal.II/contrib/cmake/configure/configure_threads.cmake index 258a522be2..f47632bcd0 100644 --- a/deal.II/contrib/cmake/configure/configure_threads.cmake +++ b/deal.II/contrib/cmake/configure/configure_threads.cmake @@ -3,8 +3,8 @@ INCLUDE(CheckCXXSourceCompiles) FIND_PACKAGE(Threads REQUIRED) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") # TODO -LIST(APPEND deal_ii_required_linker_flags ${CMAKE_THREAD_LIBS_INIT}) # TODO +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") +LIST(APPEND deal_ii_required_linker_flags ${CMAKE_THREAD_LIBS_INIT}) IF(NOT DEAL_II_FORCE_CONTRIB_TBB) IF(DEAL_II_ALLOW_CONTRIB)