]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Update
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Sep 2012 18:56:38 +0000 (18:56 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Sep 2012 18:56:38 +0000 (18:56 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26324 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_boost.cmake
deal.II/contrib/cmake/configure/configure_compiler_flags.cmake [new file with mode: 0644]
deal.II/contrib/cmake/configure/configure_threads.cmake

index c5c468f777bfa3884c4a2672a85b9cfad7702cf2..442387c99bc0c55a3a4c49abe8fcbeea73e2d90b 100644 (file)
@@ -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)
index f48d37a163f506e96bcb1981f9ad1b76f0cb7218..c066e3019d6500928a77cdde8804840a7750bcc5 100644 (file)
@@ -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 (file)
index 0000000..dc87f53
--- /dev/null
@@ -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")
+
index 258a522be22fe0e770585a96c62d418d52ae7d23..f47632bcd0ae1b997b428815388d001b2089b7ae 100644 (file)
@@ -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)

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.