From 83f7d50590d5f19d8dc828ad674feeffaaed0e60 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 28 Nov 2022 17:53:51 -0600 Subject: [PATCH] CMake: remove old source configuration --- cmake/macros/macro_define_object_target.cmake | 27 ++---- .../macro_populate_target_properties.cmake | 94 +++++++++++++++++++ .../macro_print_target_properties.cmake | 54 +++++++++++ cmake/macros/macro_register_feature.cmake | 72 -------------- cmake/setup_write_config.cmake | 38 +++++--- source/CMakeLists.txt | 43 ++++----- source/algorithms/CMakeLists.txt | 2 - source/arborx/CMakeLists.txt | 2 - source/base/CMakeLists.txt | 2 - source/cgal/CMakeLists.txt | 6 -- source/differentiation/ad/CMakeLists.txt | 2 - source/differentiation/sd/CMakeLists.txt | 2 - source/distributed/CMakeLists.txt | 2 - source/dofs/CMakeLists.txt | 2 - source/fe/CMakeLists.txt | 2 - source/gmsh/CMakeLists.txt | 2 - source/grid/CMakeLists.txt | 3 - source/hp/CMakeLists.txt | 2 - source/integrators/CMakeLists.txt | 2 - source/lac/CMakeLists.txt | 2 - source/matrix_free/CMakeLists.txt | 2 - source/meshworker/CMakeLists.txt | 2 - source/multigrid/CMakeLists.txt | 2 - source/non_matching/CMakeLists.txt | 2 - source/numerics/CMakeLists.txt | 2 - source/opencascade/CMakeLists.txt | 2 - source/optimization/rol/CMakeLists.txt | 2 - source/particles/CMakeLists.txt | 3 - source/physics/CMakeLists.txt | 2 - source/physics/elasticity/CMakeLists.txt | 3 - source/sundials/CMakeLists.txt | 2 - 31 files changed, 198 insertions(+), 187 deletions(-) create mode 100644 cmake/macros/macro_populate_target_properties.cmake create mode 100644 cmake/macros/macro_print_target_properties.cmake delete mode 100644 cmake/macros/macro_register_feature.cmake diff --git a/cmake/macros/macro_define_object_target.cmake b/cmake/macros/macro_define_object_target.cmake index f64939fd11..f0eba3bc01 100644 --- a/cmake/macros/macro_define_object_target.cmake +++ b/cmake/macros/macro_define_object_target.cmake @@ -1,6 +1,6 @@ ## --------------------------------------------------------------------- ## -## Copyright (C) 2012 - 2018 by the deal.II authors +## Copyright (C) 2012 - 2022 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -41,37 +41,30 @@ function(define_object_library _library) foreach(_build ${DEAL_II_BUILD_TYPES}) string(TOLOWER ${_build} _build_lowercase) + set(_target "${_library}_${_build_lowercase}") - add_library(${_library}_${_build_lowercase} ${ARGN}) + add_library(${_target} ${ARGN}) - set_target_properties(${_library}_${_build_lowercase} PROPERTIES - LINKER_LANGUAGE "CXX" - ) + # + # Add standard properties defined in DEAL_II_* variables: + # - target_link_libraries(${_library}_${_build_lowercase} - PUBLIC ${DEAL_II_TARGETS} ${DEAL_II_TARGETS_${_build}} - ) + populate_target_properties(${_target} ${_build}) if("${_library}" MATCHES "^bundled_") # # Record all bundled object libraries in the global property # DEAL_II_BUNDLED_TARGETS_${_build} # - set_property(GLOBAL APPEND PROPERTY DEAL_II_BUNDLED_TARGETS_${_build} - ${_library}_${_build_lowercase} - ) + set_property(GLOBAL APPEND PROPERTY DEAL_II_BUNDLED_TARGETS_${_build} ${_target}) else() get_property(_bundled_object_targets GLOBAL PROPERTY DEAL_II_BUNDLED_TARGETS_${build} ) - target_link_libraries(${_library}_${_build_lowercase} - PRIVATE ${_bundled_object_targets} - ) + target_link_libraries(${_target} PRIVATE ${_bundled_object_targets}) endif() - set_property(GLOBAL APPEND PROPERTY DEAL_II_OBJECT_TARGETS_${_build} - ${_library}_${_build_lowercase} - ) + set_property(GLOBAL APPEND PROPERTY DEAL_II_OBJECT_TARGETS_${_build} ${_target}) endforeach() endfunction() diff --git a/cmake/macros/macro_populate_target_properties.cmake b/cmake/macros/macro_populate_target_properties.cmake new file mode 100644 index 0000000000..4f52799e44 --- /dev/null +++ b/cmake/macros/macro_populate_target_properties.cmake @@ -0,0 +1,94 @@ +## --------------------------------------------------------------------- +## +## Copyright (C) 2022 - 2022 by the deal.II authors +## +## This file is part of the deal.II library. +## +## The deal.II library is free software; you can use it, redistribute +## it, and/or modify it under the terms of the GNU Lesser General +## Public License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## The full text of the license can be found in the file LICENSE.md at +## the top level directory of deal.II. +## +## --------------------------------------------------------------------- + +# +# populate_target_properties( ) +# +# This function populate target properties according to (globally) defined +# DEAL_II_* variables. Specifically: +# +# DEAL_II_LIBRARIES DEAL_II_LIBRARIES_ +# DEAL_II_TARGETS DEAL_II_TARGETS_ +# - populating the LINK_LIBRARIES target property +# DEAL_II_INCLUDE_DIRS +# - populating the INCLUDE_DIRECTORIES target property +# DEAL_II_DEFINITIONS DEAL_II_DEFINITIONS_ +# - populating the COMPILE_DEFINITIONS target property +# DEAL_II_CXX_FLAGS DEAL_II_CXX_FLAGS_ +# - populating the COMPILE_OPTIONS target property +# DEAL_II_LINKER_FLAGS DEAL_II_LINKER_FLAGS_ +# - populating the LINK_OPTIONS target property +# +# In addition the macro sets up a BUILD_INTERFACE and INSTALL_INTERFACE +# includes +# + +function(populate_target_properties _target _build) + + set_target_properties(${_target} PROPERTIES LINKER_LANGUAGE "CXX") + + target_link_libraries(${_target} + PUBLIC ${DEAL_II_LIBRARIES} ${DEAL_II_LIBRARIES_${_build}} + ${DEAL_II_TARGETS} ${DEAL_II_TARGETS_${_build}} + ) + + # + # Include the current source directory of any target as private include + # and add the contents of ${DEAL_II_INCLUDE_DIRS} as a public interface. + # + target_include_directories(${_target} BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(${_target} SYSTEM PUBLIC ${DEAL_II_INCLUDE_DIRS}) + + # Build directory specific includes: + + target_include_directories(${_target} PRIVATE + ${CMAKE_BINARY_DIR}/include + ${CMAKE_SOURCE_DIR}/include + ${DEAL_II_BUNDLED_INCLUDE_DIRS} + ) + + # Interface includes: + + set(_includes + $ + $ + "$" + ) + foreach(_include ${DEAL_II_BUNDLED_INCLUDE_DIRS}) + list(APPEND _includes $) + endforeach() + if(NOT "${DEAL_II_BUNDLED_INCLUDE_DIRS}" STREQUAL "") + list(APPEND _includes "$") + endif() + + target_include_directories(${_target} INTERFACE ${_includes}) + + target_compile_definitions(${_target} + PUBLIC ${DEAL_II_DEFINITIONS} ${DEAL_II_DEFINITIONS_${_build}} + ) + + separate_arguments(_compile_options UNIX_COMMAND + "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}" + ) + target_compile_options(${_target} + PUBLIC $<$:${_compile_options}> + ) + + separate_arguments(_link_options UNIX_COMMAND + "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}" + ) + target_link_options(${_target} INTERFACE ${_link_options}) + +endfunction() diff --git a/cmake/macros/macro_print_target_properties.cmake b/cmake/macros/macro_print_target_properties.cmake new file mode 100644 index 0000000000..e627f17909 --- /dev/null +++ b/cmake/macros/macro_print_target_properties.cmake @@ -0,0 +1,54 @@ +## --------------------------------------------------------------------- +## +## Copyright (C) 2022 - 2022 by the deal.II authors +## +## This file is part of the deal.II library. +## +## The deal.II library is free software; you can use it, redistribute +## it, and/or modify it under the terms of the GNU Lesser General +## Public License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## The full text of the license can be found in the file LICENSE.md at +## the top level directory of deal.II. +## +## --------------------------------------------------------------------- + +# +# print_target_properties( [variable]) +# +# Prints all relevant information of the specified target. +# + +function(print_target_properties _target) + + if(NOT TARGET ${_target}) + return() + endif() + + set(_messages) + list(APPEND _messages "Target: ${_target}") + + foreach(_property + TYPE + LINK_LIBRARIES INTERFACE_LINK_LIBRARIES + INCLUDE_DIRECTORIES INTERFACE_INCLUDE_DIRECTORIES + COMPILE_DEFINITIONS INTERFACE_COMPILE_DEFINITIONS + COMPILE_OPTIONS INTERFACE_COMPILE_OPTIONS + LINK_OPTIONS INTERFACE_LINK_OPTIONS + ) + get_target_property(_value ${_target} ${_property}) + if(NOT "${_value}" MATCHES "-NOTFOUND") + string(REPLACE ";" " " _value "${_value}") + list(APPEND _messages " ${_property}: ${_value}") + endif() + endforeach() + + if("${ARGN}" STREQUAL "") + foreach(_message ${_messages}) + message(STATUS "${_message}") + endforeach() + else() + set(${ARGN} "${_messages}" PARENT_SCOPE) + endif() +endfunction() + diff --git a/cmake/macros/macro_register_feature.cmake b/cmake/macros/macro_register_feature.cmake deleted file mode 100644 index 71bf4c03d4..0000000000 --- a/cmake/macros/macro_register_feature.cmake +++ /dev/null @@ -1,72 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2013 - 2015 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE.md at -## the top level directory of deal.II. -## -## --------------------------------------------------------------------- - -# -# This macro is used for the feature configuration in deal.II. It adds -# individual FEATURE_* configuration variables to the corresponding -# DEAL_II_* variables -# -# Usage: -# register_feature(feature) -# -# This macro will add -# -# _LIBRARIES (respecting general, optimized, debug keyword) -# -# and all other suffixes defined in DEAL_II_LIST_SUFFIXES and -# DEAL_II_STRING_SUFFIXES to the corresponding DEAL_II_* variables -# - -macro(register_feature _feature) - - if(DEFINED ${_feature}_LIBRARIES) - # - # Add ${_feature}_LIBRARIES to - # DEAL_II_LIBRARIES - # DEAL_II_LIBRARIES_DEBUG - # DEAL_II_LIBRARIES_RELEASE - # depending on the "optimized", "debug" or "general" keyword - # - set(_toggle "general") - foreach(_tmp ${${_feature}_LIBRARIES}) - if( "${_tmp}" STREQUAL "debug" OR - "${_tmp}" STREQUAL "optimized" OR - "${_tmp}" STREQUAL "general" ) - set(_toggle "${_tmp}") - else() - if("${_toggle}" STREQUAL "general") - list(APPEND DEAL_II_LIBRARIES ${_tmp}) - elseif("${_toggle}" STREQUAL "debug") - list(APPEND DEAL_II_LIBRARIES_DEBUG ${_tmp}) - elseif("${_toggle}" STREQUAL "optimized") - list(APPEND DEAL_II_LIBRARIES_RELEASE ${_tmp}) - endif() - endif() - endforeach() - endif() - - foreach(_var ${DEAL_II_LIST_SUFFIXES}) - if(NOT "${_var}" STREQUAL "LIBRARIES" AND DEFINED ${_feature}_${_var}) - list(APPEND DEAL_II_${_var} ${${_feature}_${_var}}) - endif() - endforeach() - - foreach(_var ${DEAL_II_STRING_SUFFIXES}) - if(DEFINED ${_feature}_${_var}) - add_flags(DEAL_II_${_var} "${${_feature}_${_var}}") - endif() - endforeach() - -endmacro() diff --git a/cmake/setup_write_config.cmake b/cmake/setup_write_config.cmake index 8bf9a2b257..402d6fb2d2 100644 --- a/cmake/setup_write_config.cmake +++ b/cmake/setup_write_config.cmake @@ -106,43 +106,51 @@ endif() _both("#\n") _detailed( -"# Base configuration (prior to feature configuration): -# DEAL_II_CXX_FLAGS: ${BASE_CXX_FLAGS} +"# Base configuration: +# DEAL_II_CXX_FLAGS: ${DEAL_II_CXX_FLAGS} " ) if(CMAKE_BUILD_TYPE MATCHES "Release") - _detailed("# DEAL_II_CXX_FLAGS_RELEASE: ${BASE_CXX_FLAGS_RELEASE}\n") + _detailed("# DEAL_II_CXX_FLAGS_RELEASE: ${DEAL_II_CXX_FLAGS_RELEASE}\n") endif() if(CMAKE_BUILD_TYPE MATCHES "Debug") - _detailed("# DEAL_II_CXX_FLAGS_DEBUG: ${BASE_CXX_FLAGS_DEBUG}\n") + _detailed("# DEAL_II_CXX_FLAGS_DEBUG: ${DEAL_II_CXX_FLAGS_DEBUG}\n") endif() -_detailed("# DEAL_II_LINKER_FLAGS: ${BASE_LINKER_FLAGS}\n") +_detailed("# DEAL_II_LINKER_FLAGS: ${DEAL_II_LINKER_FLAGS}\n") if(CMAKE_BUILD_TYPE MATCHES "Release") - _detailed("# DEAL_II_LINKER_FLAGS_RELEASE: ${BASE_LINKER_FLAGS_RELEASE}\n") + _detailed("# DEAL_II_LINKER_FLAGS_RELEASE: ${DEAL_II_LINKER_FLAGS_RELEASE}\n") endif() if(CMAKE_BUILD_TYPE MATCHES "Debug") - _detailed("# DEAL_II_LINKER_FLAGS_DEBUG: ${BASE_LINKER_FLAGS_DEBUG}\n") + _detailed("# DEAL_II_LINKER_FLAGS_DEBUG: ${DEAL_II_LINKER_FLAGS_DEBUG}\n") endif() -_detailed("# DEAL_II_DEFINITIONS: ${BASE_DEFINITIONS}\n") +_detailed("# DEAL_II_DEFINITIONS: ${DEAL_II_DEFINITIONS}\n") if(CMAKE_BUILD_TYPE MATCHES "Release") - _detailed("# DEAL_II_DEFINITIONS_RELEASE: ${BASE_DEFINITIONS_RELEASE}\n") + _detailed("# DEAL_II_DEFINITIONS_RELEASE: ${DEAL_II_DEFINITIONS_RELEASE}\n") endif() if(CMAKE_BUILD_TYPE MATCHES "Debug") - _detailed("# DEAL_II_DEFINITIONS_DEBUG: ${BASE_DEFINITIONS_DEBUG}\n") + _detailed("# DEAL_II_DEFINITIONS_DEBUG: ${DEAL_II_DEFINITIONS_DEBUG}\n") endif() -_detailed("# DEAL_II_INCLUDE_DIRS ${BASE_INCLUDE_DIRS}\n") -_detailed("# DEAL_II_BUNDLED_INCLUDE_DIRS: ${BASE_BUNDLED_INCLUDE_DIRS}\n") +_detailed("# DEAL_II_INCLUDE_DIRS ${DEAL_II_INCLUDE_DIRS}\n") -_detailed("# DEAL_II_LIBRARIES: ${BASE_LIBRARIES}\n") +_detailed("# DEAL_II_LIBRARIES: ${DEAL_II_LIBRARIES}\n") if(CMAKE_BUILD_TYPE MATCHES "Release") - _detailed("# DEAL_II_LIBRARIES_RELEASE: ${BASE_LIBRARIES_RELEASE}\n") + _detailed("# DEAL_II_LIBRARIES_RELEASE: ${DEAL_II_LIBRARIES_RELEASE}\n") endif() if(CMAKE_BUILD_TYPE MATCHES "Debug") - _detailed("# DEAL_II_LIBRARIES_DEBUG: ${BASE_LIBRARIES_DEBUG}\n") + _detailed("# DEAL_II_LIBRARIES_DEBUG: ${DEAL_II_LIBRARIES_DEBUG}\n") endif() + +_detailed("# DEAL_II_TARGETS: ${DEAL_II_TARGETS}\n") +if(CMAKE_BUILD_TYPE MATCHES "Release") + _detailed("# DEAL_II_TARGETS_RELEASE: ${DEAL_II_TARGETS_RELEASE}\n") +endif() +if(CMAKE_BUILD_TYPE MATCHES "Debug") + _detailed("# DEAL_II_TARGETS_DEBUG: ${DEAL_II_TARGETS_DEBUG}\n") +endif() + _detailed("# DEAL_II_VECTORIZATION_WIDTH_IN_BITS: ${DEAL_II_VECTORIZATION_WIDTH_IN_BITS}\n") if(DEAL_II_HAVE_CXX20) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index ce9b1ff232..e2b766ec09 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -35,14 +35,6 @@ endif() # Compile the deal.II library # -include_directories( - ${CMAKE_BINARY_DIR}/include/ - ${CMAKE_SOURCE_DIR}/include/ - ${DEAL_II_BUNDLED_INCLUDE_DIRS} - SYSTEM - ${DEAL_II_INCLUDE_DIRS} - ) - # # List the directories where we have source files. the ones with the longest # compile jobs come first so that 'make -j N' saturates many processors also @@ -51,6 +43,7 @@ include_directories( # end of everything (e.g. numerics/vectors.cc takes several minutes to # compile...) # +set(CMAKE_INCLUDE_CURRENT_DIR true) add_subdirectory(numerics) add_subdirectory(fe) add_subdirectory(dofs) @@ -83,16 +76,26 @@ foreach(build ${DEAL_II_BUILD_TYPES}) # Combine all ${build} OBJECT targets to a ${build} library: # - get_property(_objects GLOBAL PROPERTY DEAL_II_OBJECTS_${build}) + add_library(${DEAL_II_NAMESPACE}_${build_lowercase} dummy.cc) + add_dependencies(library ${DEAL_II_NAMESPACE}_${build_lowercase}) - add_library(${DEAL_II_NAMESPACE}_${build_lowercase} - dummy.cc # Workaround for a bug in the Xcode generator - ${_objects} + # + # Add compile flags, definitions and (public) feature (recorded in + # DEAL_II_TARGETS(|_DEBUG|_RELEASE)). + # + populate_target_properties(${DEAL_II_NAMESPACE}_${build_lowercase} ${build}) + + # + # Add all object targets as private link targets + # + get_property(_object_targets GLOBAL PROPERTY DEAL_II_OBJECT_TARGETS_${build}) + target_link_libraries(${DEAL_II_NAMESPACE}_${build_lowercase} + PRIVATE ${_object_targets} ) - add_dependencies(library ${DEAL_II_NAMESPACE}_${build_lowercase}) set_target_properties(${DEAL_II_NAMESPACE}_${build_lowercase} PROPERTIES + LINKER_LANGUAGE "CXX" VERSION "${DEAL_II_PACKAGE_VERSION}" # # Sonaming: Well... we just use the version number. @@ -100,10 +103,6 @@ foreach(build ${DEAL_II_BUILD_TYPES}) # a C++ library is still ABI backwards compatible :-] # SOVERSION "${DEAL_II_PACKAGE_VERSION}" - LINK_FLAGS "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${build}}" - LINKER_LANGUAGE "CXX" - COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${build}}" - COMPILE_FLAGS "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${build}}" ARCHIVE_OUTPUT_NAME "${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}" LIBRARY_OUTPUT_NAME "${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}" RUNTIME_OUTPUT_NAME "${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}" @@ -141,15 +140,7 @@ foreach(build ${DEAL_II_BUILD_TYPES}) ) endif() - - target_link_libraries(${DEAL_II_NAMESPACE}_${build_lowercase} - ${DEAL_II_LIBRARIES_${build}} - ${DEAL_II_LIBRARIES} - ) - - file(MAKE_DIRECTORY - ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR} - ) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}) export(TARGETS ${DEAL_II_NAMESPACE}_${build_lowercase} NAMESPACE "${DEAL_II_NAMESPACE}::" FILE ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Targets.cmake diff --git a/source/algorithms/CMakeLists.txt b/source/algorithms/CMakeLists.txt index eb1c12e2b2..e9467c9741 100644 --- a/source/algorithms/CMakeLists.txt +++ b/source/algorithms/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src general_data_storage.cc operator.cc diff --git a/source/arborx/CMakeLists.txt b/source/arborx/CMakeLists.txt index fc2c709f9f..926c1a7c85 100644 --- a/source/arborx/CMakeLists.txt +++ b/source/arborx/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src access_traits.cc ) diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt index ed6baf880c..1a134b2051 100644 --- a/source/base/CMakeLists.txt +++ b/source/base/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - # # All source/base files are sufficiently small that they may be added to the # unity build file (see the developer documentation on DEAL_II_UNITY_BUILD diff --git a/source/cgal/CMakeLists.txt b/source/cgal/CMakeLists.txt index 8898bc44a1..8271c0e9c5 100644 --- a/source/cgal/CMakeLists.txt +++ b/source/cgal/CMakeLists.txt @@ -13,17 +13,11 @@ ## ## --------------------------------------------------------------------- - -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - - set(_src surface_mesh.cc intersections.cc ) - - set(_inst surface_mesh.inst.in intersections.inst.in diff --git a/source/differentiation/ad/CMakeLists.txt b/source/differentiation/ad/CMakeLists.txt index f0d77650e0..3d3b5a1a25 100644 --- a/source/differentiation/ad/CMakeLists.txt +++ b/source/differentiation/ad/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src ad_drivers.cc ad_helpers.cc diff --git a/source/differentiation/sd/CMakeLists.txt b/source/differentiation/sd/CMakeLists.txt index a545a01a6f..8aa3d9ce92 100644 --- a/source/differentiation/sd/CMakeLists.txt +++ b/source/differentiation/sd/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src symengine_math.cc symengine_number_types.cc diff --git a/source/distributed/CMakeLists.txt b/source/distributed/CMakeLists.txt index 86a2350fd7..c03133ff60 100644 --- a/source/distributed/CMakeLists.txt +++ b/source/distributed/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src grid_refinement.cc cell_weights.cc diff --git a/source/dofs/CMakeLists.txt b/source/dofs/CMakeLists.txt index aa49031970..d2db6c3d6c 100644 --- a/source/dofs/CMakeLists.txt +++ b/source/dofs/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src block_info.cc dof_faces.cc diff --git a/source/fe/CMakeLists.txt b/source/fe/CMakeLists.txt index 7f88c1771d..db9b8fe7d0 100644 --- a/source/fe/CMakeLists.txt +++ b/source/fe/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src block_mask.cc component_mask.cc diff --git a/source/gmsh/CMakeLists.txt b/source/gmsh/CMakeLists.txt index 270faa21ff..994ba926e4 100644 --- a/source/gmsh/CMakeLists.txt +++ b/source/gmsh/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src utilities.cc ) diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt index 6d2a964169..c622f699a5 100644 --- a/source/grid/CMakeLists.txt +++ b/source/grid/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - # # Work around an issue where gcc emits a note that the warning # -Wmisleading-indentation will be disabled due to a humongous line of over @@ -31,7 +29,6 @@ if(DEAL_II_WITH_CGAL) ) endif() - set(_unity_include_src cell_id.cc grid_refinement.cc diff --git a/source/hp/CMakeLists.txt b/source/hp/CMakeLists.txt index e7544c3aa1..d458fd3e48 100644 --- a/source/hp/CMakeLists.txt +++ b/source/hp/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src fe_collection.cc fe_values.cc diff --git a/source/integrators/CMakeLists.txt b/source/integrators/CMakeLists.txt index 5804c13ab3..156573c095 100644 --- a/source/integrators/CMakeLists.txt +++ b/source/integrators/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src ) diff --git a/source/lac/CMakeLists.txt b/source/lac/CMakeLists.txt index d1b9568113..1ada9bea31 100644 --- a/source/lac/CMakeLists.txt +++ b/source/lac/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src affine_constraints.cc block_sparse_matrix.cc diff --git a/source/matrix_free/CMakeLists.txt b/source/matrix_free/CMakeLists.txt index e0297cfc36..995f85a391 100644 --- a/source/matrix_free/CMakeLists.txt +++ b/source/matrix_free/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src dof_info.cc evaluation_template_factory.cc diff --git a/source/meshworker/CMakeLists.txt b/source/meshworker/CMakeLists.txt index d541931787..2fde5beeac 100644 --- a/source/meshworker/CMakeLists.txt +++ b/source/meshworker/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src mesh_worker.cc mesh_worker_info.cc diff --git a/source/multigrid/CMakeLists.txt b/source/multigrid/CMakeLists.txt index 6c8bf3ec56..3f8853ca70 100644 --- a/source/multigrid/CMakeLists.txt +++ b/source/multigrid/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src mg_base.cc mg_level_global_transfer.cc diff --git a/source/non_matching/CMakeLists.txt b/source/non_matching/CMakeLists.txt index 6b7837b127..607f860d9d 100644 --- a/source/non_matching/CMakeLists.txt +++ b/source/non_matching/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src fe_immersed_values.cc fe_values.cc diff --git a/source/numerics/CMakeLists.txt b/source/numerics/CMakeLists.txt index f8f61fdd33..286badc19b 100644 --- a/source/numerics/CMakeLists.txt +++ b/source/numerics/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_unity_include_src data_out.cc data_out_faces.cc diff --git a/source/opencascade/CMakeLists.txt b/source/opencascade/CMakeLists.txt index a5b03c3db6..91f335ede8 100644 --- a/source/opencascade/CMakeLists.txt +++ b/source/opencascade/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src utilities.cc manifold_lib.cc diff --git a/source/optimization/rol/CMakeLists.txt b/source/optimization/rol/CMakeLists.txt index f826d7ee3a..7e74189268 100644 --- a/source/optimization/rol/CMakeLists.txt +++ b/source/optimization/rol/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src ) diff --git a/source/particles/CMakeLists.txt b/source/particles/CMakeLists.txt index 30a8b472d6..acc2186e12 100644 --- a/source/particles/CMakeLists.txt +++ b/source/particles/CMakeLists.txt @@ -13,9 +13,6 @@ ## ## --------------------------------------------------------------------- - -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src data_out.cc particle.cc diff --git a/source/physics/CMakeLists.txt b/source/physics/CMakeLists.txt index 79eab43f6f..a5a3467e7c 100644 --- a/source/physics/CMakeLists.txt +++ b/source/physics/CMakeLists.txt @@ -16,8 +16,6 @@ # Expand instantiations in subdirectories add_subdirectory("elasticity") -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src transformations.cc ) diff --git a/source/physics/elasticity/CMakeLists.txt b/source/physics/elasticity/CMakeLists.txt index 4ebcd18f61..1828681caa 100644 --- a/source/physics/elasticity/CMakeLists.txt +++ b/source/physics/elasticity/CMakeLists.txt @@ -13,9 +13,6 @@ ## ## --------------------------------------------------------------------- - -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src kinematics.cc standard_tensors.cc diff --git a/source/sundials/CMakeLists.txt b/source/sundials/CMakeLists.txt index 3c3c5450e6..e0838b859f 100644 --- a/source/sundials/CMakeLists.txt +++ b/source/sundials/CMakeLists.txt @@ -13,8 +13,6 @@ ## ## --------------------------------------------------------------------- -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - set(_src arkode.cc ida.cc -- 2.39.5