From: maier Date: Mon, 24 Sep 2012 19:37:34 +0000 (+0000) Subject: Make Wolfgang happy #4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4024191c247336b0d0a31c2eaf37dbf9cc12244;p=dealii-svn.git Make Wolfgang happy #4 git-svn-id: https://svn.dealii.org/branches/branch_cmake@26680 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_1_tbb.cmake b/deal.II/cmake/configure/configure_1_tbb.cmake index 97d63bb986..e91e4804a8 100644 --- a/deal.II/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/cmake/configure/configure_1_tbb.cmake @@ -72,8 +72,8 @@ MACRO(SETUP_THREADING var) STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${CMAKE_THREAD_LIBS_INIT}") IF(NOT DEAL_II_HAVE_SANE_MT_DEFINITIONS) - LIST(APPEND DEAL_II_DEFINITIONS "-D_REENTRANT" "-D_THREAD_SAFE") - LIST(APPEND DEAL_II_USER_DEFINITIONS "-D_REENTRANT" "-D_THREAD_SAFE") # TODO: Necessary? + LIST(APPEND DEAL_II_DEFINITIONS "_REENTRANT" "_THREAD_SAFE") + LIST(APPEND DEAL_II_USER_DEFINITIONS "_REENTRANT" "_THREAD_SAFE") # TODO: Necessary? ENDIF() ENDIF(Threads_FOUND) @@ -102,8 +102,7 @@ MACRO(FEATURE_TBB_CONFIGURE_EXTERNAL var) IF(TBB_DEBUG_FOUND) LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES_DEBUG ${TBB_DEBUG_LIBRARY}) LIST(APPEND DEAL_II_DEFINITIONS_DEBUG - "-DTBB_USE_DEBUG=1" - "-DTBB_DO_ASSERT=1" + "TBB_USE_DEBUG=1" "TBB_DO_ASSERT=1" ) ELSE() MESSAGE(STATUS @@ -148,7 +147,7 @@ MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var) # IF (CMAKE_BUILD_TYPE MATCHES "Debug") LIST(APPEND DEAL_II_DEFINITIONS_DEBUG - "-DTBB_DO_DEBUG=1" "-DTBB_DO_ASSERT=1" + "TBB_DO_DEBUG=1" "TBB_DO_ASSERT=1" ) ENDIF() diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index f1ef23ce9c..c395bcd0b1 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -61,10 +61,10 @@ MACRO(FEATURE_BOOST_CONFIGURE_CONTRIB var) # library: # LIST(APPEND DEAL_II_DEFINITIONS - "-DBOOST_NO_HASH" "-DBOOST_NO_SLIST" + "BOOST_NO_HASH" "BOOST_NO_SLIST" ) LIST(APPEND DEAL_II_USER_DEFINIITONS - "-DBOOST_NO_HASH" "-DBOOST_NO_SLIST" + "BOOST_NO_HASH" "BOOST_NO_SLIST" ) INCLUDE_DIRECTORIES( diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index 4c3770cb77..bbce6f645d 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -129,8 +129,8 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) STRIP_FLAG(CMAKE_REQUIRED_FLAGS "-DHAS_C99_TR1_CMATH") IF(TRILINOS_HAS_C99_TR1_WORKAROUND) - LIST(APPEND DEAL_II_DEFINITIONS "-DHAS_C99_TR1_CMATH") - LIST(APPEND DEAL_II_USER_DEFINITIONS "-DHAS_C99_TR1_CMATH") + LIST(APPEND DEAL_II_DEFINITIONS "HAS_C99_TR1_CMATH") + LIST(APPEND DEAL_II_USER_DEFINITIONS "HAS_C99_TR1_CMATH") ELSE() MESSAGE(WARNING "\n" "Your Trilinos installation is not compatible with the C++ standard selected for\n" diff --git a/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake b/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake new file mode 100644 index 0000000000..d527cb5224 --- /dev/null +++ b/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake @@ -0,0 +1,16 @@ + +# +# TODO: A comment +# + +MACRO(DEAL_II_ADD_DEPENDENCIES name target) + + IF(CMAKE_BUILD_TYPE MATCHES "Debug") + ADD_DEPENDENCIES(${name}.g ${target}.g) + ENDIF() + + IF(CMAKE_BUILD_TYPE MATCHES "Release") + ADD_DEPENDENCIES(${name} ${target}) + ENDIF() + +ENDMACRO() diff --git a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake new file mode 100644 index 0000000000..3f8cdbc562 --- /dev/null +++ b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake @@ -0,0 +1,38 @@ + +# +# TODO: A comment +# + +MACRO(DEAL_II_ADD_LIBRARY name) + + IF(CMAKE_BUILD_TYPE MATCHES "Debug") + # + # and a debug target + # + ADD_LIBRARY(${name}.g + ${ARGN} + ) + + SET_TARGET_PROPERTIES(${name}.g PROPERTIES + LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}" + COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_DEBUG}" + COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_DEBUG}" + ) + ENDIF() + + IF(CMAKE_BUILD_TYPE MATCHES "Release") + # + # Add a release target + # + ADD_LIBRARY(${name} + ${ARGN} + ) + + SET_TARGET_PROPERTIES(${name} PROPERTIES + LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_RELEASE}" + COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_RELEASE}" + COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_RELEASE}" + ) + ENDIF() + +ENDMACRO() diff --git a/deal.II/cmake/macros/macro_expand_instantiations.cmake b/deal.II/cmake/macros/macro_expand_instantiations.cmake index cb2f60e11e..3b1bcd91e0 100644 --- a/deal.II/cmake/macros/macro_expand_instantiations.cmake +++ b/deal.II/cmake/macros/macro_expand_instantiations.cmake @@ -2,7 +2,7 @@ # A macro for the inst.in file expansion # # Usage: -# macro_expand_instantiations(target inst_in_files) +# EXPAND_INSTANTATIONS(target inst_in_files) # # Options: # @@ -16,7 +16,7 @@ # a list of inst.in files that will be expanded # -MACRO(macro_expand_instantiations target inst_in_files) +MACRO(EXPAND_INSTANTIATIONS target inst_in_files) FOREACH (inst_in_file ${inst_in_files}) STRING(REGEX REPLACE "\\.in$" "" inst_file "${inst_in_file}" ) @@ -43,6 +43,12 @@ MACRO(macro_expand_instantiations target inst_in_files) # Add a dependency to target so that target.inst is fully generated # before target will be processed. # - ADD_DEPENDENCIES(${target} ${target}.inst) + IF(CMAKE_BUILD_TYPE MATCHES "Debug") + ADD_DEPENDENCIES(${target}.g ${target}.inst) + ENDIF() + IF(CMAKE_BUILD_TYPE MATCHES "Release") + ADD_DEPENDENCIES(${target} ${target}.inst) + ENDIF() + ENDMACRO() diff --git a/deal.II/cmake/setup_compiler_flags_gnu.cmake b/deal.II/cmake/setup_compiler_flags_gnu.cmake index abd20a23b7..42c01b62f3 100644 --- a/deal.II/cmake/setup_compiler_flags_gnu.cmake +++ b/deal.II/cmake/setup_compiler_flags_gnu.cmake @@ -127,8 +127,8 @@ ENDIF() IF (CMAKE_BUILD_TYPE MATCHES "Debug") - LIST(APPEND DEAL_II_DEFINITIONS_DEBUG "-DDEBUG") - LIST(APPEND DEAL_II_USER_DEFINTIONS_DEBUG "-DDEBUG") + LIST(APPEND DEAL_II_DEFINITIONS_DEBUG "DEBUG") + LIST(APPEND DEAL_II_USER_DEFINTIONS_DEBUG "DEBUG") ADD_FLAGS(DEAL_II_CXX_FLAGS_DEBUG "-O0") diff --git a/deal.II/source/base/CMakeLists.txt b/deal.II/source/base/CMakeLists.txt index 13ad99d0c4..17bc7399e4 100644 --- a/deal.II/source/base/CMakeLists.txt +++ b/deal.II/source/base/CMakeLists.txt @@ -46,6 +46,6 @@ SET(src_base utilities.cc ) -ADD_LIBRARY(obj_base OBJECT ${src_base}) -ADD_DEPENDENCIES(obj_base deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_base OBJECT ${src_base}) +DEAL_II_ADD_DEPENDENCIES(obj_base deal_ii_target_dependencies) diff --git a/deal.II/source/distributed/CMakeLists.txt b/deal.II/source/distributed/CMakeLists.txt index 44b609ba56..e5c21cbec8 100644 --- a/deal.II/source/distributed/CMakeLists.txt +++ b/deal.II/source/distributed/CMakeLists.txt @@ -10,6 +10,6 @@ SET(inst_in_files tria.inst.in ) -ADD_LIBRARY(obj_distributed OBJECT ${src}) -macro_expand_instantiations(obj_distributed "${inst_in_files}") -ADD_DEPENDENCIES(obj_distributed deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_distributed OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_distributed "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_distributed deal_ii_target_dependencies) diff --git a/deal.II/source/dofs/CMakeLists.txt b/deal.II/source/dofs/CMakeLists.txt index cbf571ae7f..cc8db53bf8 100644 --- a/deal.II/source/dofs/CMakeLists.txt +++ b/deal.II/source/dofs/CMakeLists.txt @@ -20,6 +20,6 @@ SET(inst_in_files dof_tools.inst.in ) -ADD_LIBRARY(obj_dofs OBJECT ${src}) -macro_expand_instantiations(obj_dofs "${inst_in_files}") -ADD_DEPENDENCIES(obj_dofs deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_dofs OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_dofs "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_dofs deal_ii_target_dependencies) diff --git a/deal.II/source/fe/CMakeLists.txt b/deal.II/source/fe/CMakeLists.txt index a9593060bd..6546ec8722 100644 --- a/deal.II/source/fe/CMakeLists.txt +++ b/deal.II/source/fe/CMakeLists.txt @@ -63,6 +63,6 @@ SET(inst_in_files mapping_q.inst.in ) -ADD_LIBRARY(obj_fe OBJECT ${src}) -macro_expand_instantiations(obj_fe "${inst_in_files}") -ADD_DEPENDENCIES(obj_fe deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_fe OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_fe "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_fe deal_ii_target_dependencies) diff --git a/deal.II/source/grid/CMakeLists.txt b/deal.II/source/grid/CMakeLists.txt index 92a498766a..bd5e2c8f67 100644 --- a/deal.II/source/grid/CMakeLists.txt +++ b/deal.II/source/grid/CMakeLists.txt @@ -30,6 +30,6 @@ SET(inst_in_files tria_objects.inst.in ) -ADD_LIBRARY(obj_grid OBJECT ${src}) -macro_expand_instantiations(obj_grid "${inst_in_files}") -ADD_DEPENDENCIES(obj_grid deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_grid OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_grid "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_grid deal_ii_target_dependencies) diff --git a/deal.II/source/hp/CMakeLists.txt b/deal.II/source/hp/CMakeLists.txt index 5aad253514..6bdbe68416 100644 --- a/deal.II/source/hp/CMakeLists.txt +++ b/deal.II/source/hp/CMakeLists.txt @@ -15,6 +15,6 @@ SET(inst_in_files mapping_collection.inst.in ) -ADD_LIBRARY(obj_hp OBJECT ${src}) -macro_expand_instantiations(obj_hp "${inst_in_files}") -ADD_DEPENDENCIES(obj_hp deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_hp OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_hp "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_hp deal_ii_target_dependencies) diff --git a/deal.II/source/lac/CMakeLists.txt b/deal.II/source/lac/CMakeLists.txt index 56d059dbdf..fbaa195dae 100644 --- a/deal.II/source/lac/CMakeLists.txt +++ b/deal.II/source/lac/CMakeLists.txt @@ -78,6 +78,6 @@ SET(inst_in_files vector_view.inst.in ) -ADD_LIBRARY(obj_lac OBJECT ${src}) -macro_expand_instantiations(obj_lac "${inst_in_files}") -ADD_DEPENDENCIES(obj_lac deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_lac OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_lac "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_lac deal_ii_target_dependencies) diff --git a/deal.II/source/multigrid/CMakeLists.txt b/deal.II/source/multigrid/CMakeLists.txt index 734a5ed9f4..f350671bfa 100644 --- a/deal.II/source/multigrid/CMakeLists.txt +++ b/deal.II/source/multigrid/CMakeLists.txt @@ -18,6 +18,6 @@ SET(inst_in_files mg_transfer_prebuilt.inst.in ) -ADD_LIBRARY(obj_multigrid OBJECT ${src}) -macro_expand_instantiations(obj_multigrid "${inst_in_files}") -ADD_DEPENDENCIES(obj_multigrid deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_multigrid OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_multigrid "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_multigrid deal_ii_target_dependencies) diff --git a/deal.II/source/numerics/CMakeLists.txt b/deal.II/source/numerics/CMakeLists.txt index 1abb241609..f98d5cfd8a 100644 --- a/deal.II/source/numerics/CMakeLists.txt +++ b/deal.II/source/numerics/CMakeLists.txt @@ -40,6 +40,6 @@ SET(inst_in_files vector_tools.inst.in ) -ADD_LIBRARY(obj_numerics OBJECT ${src}) -macro_expand_instantiations(obj_numerics "${inst_in_files}") -ADD_DEPENDENCIES(obj_numerics deal_ii_target_dependencies) +DEAL_II_ADD_LIBRARY(obj_numerics OBJECT ${src}) +EXPAND_INSTANTIATIONS(obj_numerics "${inst_in_files}") +DEAL_II_ADD_DEPENDENCIES(obj_numerics deal_ii_target_dependencies)