From 2266c7a06affec999bd241d0b78f48eb8ab82e62 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 31 Oct 2012 09:33:01 +0000 Subject: [PATCH] Reorganize the top level directory structure git-svn-id: https://svn.dealii.org/branches/branch_cmake@27249 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 4 ++-- deal.II/{ => cmake}/config/CMakeLists.txt | 0 deal.II/{ => cmake}/config/Config.cmake.in | 0 deal.II/{ => cmake}/config/ConfigVersion.cmake.in | 0 deal.II/{ => cmake}/config/Make.global_options.in | 0 deal.II/{ => cmake}/config/distclean.cmake.in | 0 deal.II/{ => cmake}/config/template-arguments.in | 0 deal.II/cmake/macros/macro_expand_instantiations.cmake | 2 +- deal.II/{ => cmake}/scripts/CMakeLists.txt | 0 deal.II/{ => cmake}/scripts/expand_instantiations.cc | 0 deal.II/{ => cmake}/scripts/fe_table.pl | 0 deal.II/{ => cmake}/scripts/make_dependencies.cc | 0 deal.II/{ => cmake}/scripts/report-build-tests.pl | 0 deal.II/{ => cmake}/scripts/report-regression-tests.pl | 0 deal.II/{ => cmake}/scripts/report_features.cc | 0 15 files changed, 3 insertions(+), 3 deletions(-) rename deal.II/{ => cmake}/config/CMakeLists.txt (100%) rename deal.II/{ => cmake}/config/Config.cmake.in (100%) rename deal.II/{ => cmake}/config/ConfigVersion.cmake.in (100%) rename deal.II/{ => cmake}/config/Make.global_options.in (100%) rename deal.II/{ => cmake}/config/distclean.cmake.in (100%) rename deal.II/{ => cmake}/config/template-arguments.in (100%) rename deal.II/{ => cmake}/scripts/CMakeLists.txt (100%) rename deal.II/{ => cmake}/scripts/expand_instantiations.cc (100%) rename deal.II/{ => cmake}/scripts/fe_table.pl (100%) rename deal.II/{ => cmake}/scripts/make_dependencies.cc (100%) rename deal.II/{ => cmake}/scripts/report-build-tests.pl (100%) rename deal.II/{ => cmake}/scripts/report-regression-tests.pl (100%) rename deal.II/{ => cmake}/scripts/report_features.cc (100%) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 01ab24fa4c..f7a1c76fcc 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -117,7 +117,7 @@ INCLUDE(setup_finalize) # # ########################################################################### -ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(cmake/scripts) ADD_SUBDIRECTORY(include) @@ -127,7 +127,7 @@ ENDIF() ADD_SUBDIRECTORY(source) -ADD_SUBDIRECTORY(config) # has to be included after source +ADD_SUBDIRECTORY(cmake/config) # has to be included after source ADD_SUBDIRECTORY(contrib) # has to be included after source diff --git a/deal.II/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt similarity index 100% rename from deal.II/config/CMakeLists.txt rename to deal.II/cmake/config/CMakeLists.txt diff --git a/deal.II/config/Config.cmake.in b/deal.II/cmake/config/Config.cmake.in similarity index 100% rename from deal.II/config/Config.cmake.in rename to deal.II/cmake/config/Config.cmake.in diff --git a/deal.II/config/ConfigVersion.cmake.in b/deal.II/cmake/config/ConfigVersion.cmake.in similarity index 100% rename from deal.II/config/ConfigVersion.cmake.in rename to deal.II/cmake/config/ConfigVersion.cmake.in diff --git a/deal.II/config/Make.global_options.in b/deal.II/cmake/config/Make.global_options.in similarity index 100% rename from deal.II/config/Make.global_options.in rename to deal.II/cmake/config/Make.global_options.in diff --git a/deal.II/config/distclean.cmake.in b/deal.II/cmake/config/distclean.cmake.in similarity index 100% rename from deal.II/config/distclean.cmake.in rename to deal.II/cmake/config/distclean.cmake.in diff --git a/deal.II/config/template-arguments.in b/deal.II/cmake/config/template-arguments.in similarity index 100% rename from deal.II/config/template-arguments.in rename to deal.II/cmake/config/template-arguments.in diff --git a/deal.II/cmake/macros/macro_expand_instantiations.cmake b/deal.II/cmake/macros/macro_expand_instantiations.cmake index 3f8da39c0e..8337715841 100644 --- a/deal.II/cmake/macros/macro_expand_instantiations.cmake +++ b/deal.II/cmake/macros/macro_expand_instantiations.cmake @@ -40,7 +40,7 @@ MACRO(EXPAND_INSTANTIATIONS _target _inst_in_files) DEPENDS expand_instantiations ${CMAKE_CURRENT_SOURCE_DIR}/${_inst_in_file} COMMAND expand_instantiations - ARGS ${CMAKE_BINARY_DIR}/config/template-arguments + ARGS ${CMAKE_BINARY_DIR}/cmake/config/template-arguments < ${CMAKE_CURRENT_SOURCE_DIR}/${_inst_in_file} > ${CMAKE_CURRENT_BINARY_DIR}/${_inst_file} ) diff --git a/deal.II/scripts/CMakeLists.txt b/deal.II/cmake/scripts/CMakeLists.txt similarity index 100% rename from deal.II/scripts/CMakeLists.txt rename to deal.II/cmake/scripts/CMakeLists.txt diff --git a/deal.II/scripts/expand_instantiations.cc b/deal.II/cmake/scripts/expand_instantiations.cc similarity index 100% rename from deal.II/scripts/expand_instantiations.cc rename to deal.II/cmake/scripts/expand_instantiations.cc diff --git a/deal.II/scripts/fe_table.pl b/deal.II/cmake/scripts/fe_table.pl similarity index 100% rename from deal.II/scripts/fe_table.pl rename to deal.II/cmake/scripts/fe_table.pl diff --git a/deal.II/scripts/make_dependencies.cc b/deal.II/cmake/scripts/make_dependencies.cc similarity index 100% rename from deal.II/scripts/make_dependencies.cc rename to deal.II/cmake/scripts/make_dependencies.cc diff --git a/deal.II/scripts/report-build-tests.pl b/deal.II/cmake/scripts/report-build-tests.pl similarity index 100% rename from deal.II/scripts/report-build-tests.pl rename to deal.II/cmake/scripts/report-build-tests.pl diff --git a/deal.II/scripts/report-regression-tests.pl b/deal.II/cmake/scripts/report-regression-tests.pl similarity index 100% rename from deal.II/scripts/report-regression-tests.pl rename to deal.II/cmake/scripts/report-regression-tests.pl diff --git a/deal.II/scripts/report_features.cc b/deal.II/cmake/scripts/report_features.cc similarity index 100% rename from deal.II/scripts/report_features.cc rename to deal.II/cmake/scripts/report_features.cc -- 2.39.5