From 65690c9d894883ba1dfc57926cbf32ce818ae149 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 25 Sep 2012 21:05:39 +0000 Subject: [PATCH] A Hack git-svn-id: https://svn.dealii.org/branches/branch_cmake@26739 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_petsc.cmake | 6 ++++++ deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake | 2 +- deal.II/cmake/macros/macro_deal_ii_add_library.cmake | 2 +- deal.II/cmake/setup_deal_ii.cmake | 9 +++++++++ deal.II/source/CMakeLists.txt | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index a8c452bcc6..8af5dfb993 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -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. diff --git a/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake b/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake index 28a4cd894c..7200ca3931 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake @@ -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} "$\n" ) ENDFOREACH() diff --git a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake index 364dab3435..297ce5bf4e 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake @@ -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} "$\n" ) ENDFOREACH() diff --git a/deal.II/cmake/setup_deal_ii.cmake b/deal.II/cmake/setup_deal_ii.cmake index defcbdc1c8..7c31e43193 100644 --- a/deal.II/cmake/setup_deal_ii.cmake +++ b/deal.II/cmake/setup_deal_ii.cmake @@ -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() diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 9f31091d15..9fe97ee25f 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -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} -- 2.39.5