]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
A Hack
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 21:05:39 +0000 (21:05 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 25 Sep 2012 21:05:39 +0000 (21:05 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26739 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_petsc.cmake
deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake
deal.II/cmake/macros/macro_deal_ii_add_library.cmake
deal.II/cmake/setup_deal_ii.cmake
deal.II/source/CMakeLists.txt

index a8c452bcc6f18b02e7351405b06da69ed2caa5fa..8af5dfb993b8de6062489148b4af364a45563cea 100644 (file)
@@ -59,6 +59,12 @@ MACRO(FEATURE_PETSC_CONFIGURE_EXTERNAL var)
 
   SET(DEAL_II_USE_PETSC TRUE)
 
+  #
+  # Disable a bunch of warnings when compiling with petsc:
+  #
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-long-long")
+
+
   #
   # Work around a stupidity in PETSc that makes sure it interferes in
   # a completely obnoxious way with boost.
index 28a4cd894c44717bba7f9b4e0bca932dd58088e0..7200ca393129a29b0d010ae1656d989fef35e12b 100644 (file)
@@ -19,7 +19,7 @@ MACRO(DEAL_II_ADD_C_LIBRARY library)
       )
 
     FILE(APPEND
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/deal_ii_objects_${build_lowercase}
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${build_lowercase}
       "$<TARGET_OBJECTS:${library}.${build_lowercase}>\n"
       )
   ENDFOREACH()
index 364dab3435ce11c95c935d90d044f7db9d16d099..297ce5bf4e00ca5712c80f834a9475102ec5ea9e 100644 (file)
@@ -19,7 +19,7 @@ MACRO(DEAL_II_ADD_LIBRARY library)
       )
 
     FILE(APPEND
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/deal_ii_objects_${build_lowercase}
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${build_lowercase}
       "$<TARGET_OBJECTS:${library}.${build_lowercase}>\n"
       )
   ENDFOREACH()
index defcbdc1c8f80164645053693db1839b48466342..7c31e43193efbcec7901b2fff92706d1e0f41117 100644 (file)
@@ -131,3 +131,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "Release")
   LIST(APPEND DEAL_II_BUILD_TYPES "RELEASE")
 ENDIF()
 
+#
+# TODO: Remove this hack.
+#
+FOREACH(build ${DEAL_II_BUILD_TYPES})
+  STRING(TOLOWER build_lowercase "${build}")
+  FILE(REMOVE
+    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${build_lowercase}
+    )
+ENDFOREACH()
index 9f31091d154da1571afe504c3462618f1d150455..9fe97ee25f00bc96828cc1b574bd2ca934f5775a 100644 (file)
@@ -25,7 +25,7 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
   # Combine all ${build} OBJECT targets to a ${build} library:
   #
   FILE(STRINGS
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/deal_ii_objects_${build_lowercase}
+    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${build_lowercase}
     deal_ii_objects_${build_lowercase}
     )
   ADD_LIBRARY(${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}

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.