CMake: Move headers, templates and modules to separate directories

CMake/Catch.cmake

-../contrib/catch2/Catch.cmake
\ No newline at end of file

CMake/CatchAddTests.cmake

-../contrib/catch2/CatchAddTests.cmake
\ No newline at end of file

CMake/Modules/Catch.cmake

+../../contrib/catch2/Catch.cmake
\ No newline at end of file

CMake/Modules/CatchAddTests.cmake

+../../contrib/catch2/CatchAddTests.cmake
\ No newline at end of file

CMake/Modules/ParseAndAddCatchTests.cmake

+../../contrib/catch2/ParseAndAddCatchTests.cmake
\ No newline at end of file

CMake/ParseAndAddCatchTests.cmake

-../contrib/catch2/ParseAndAddCatchTests.cmake
\ No newline at end of file

CMake/generate.conf

@@ -7,6 +7,7 @@ patch = 1
 [General]
 ProjectConfFile: project.conf
 PathToSources: ..
+PathToTemplates: ./templates/
 [Groups]
 cli

CMake/generate.py

@@ -302,7 +302,7 @@ GROUPS = {
     group: [p for n, p in PROJECTS.items() if group in p.groups] for group in Config.get_section(CONFIG, 'Groups').keys()
 }
 CATEGORIES = {
-    category: SmartOpen(template, directory=SCRIPT_DIRECTORY, mode='r').read()
+    category: SmartOpen(template, directory=Helpers.path(SCRIPT_DIRECTORY, Config.get(CONFIG, 'General', 'PathToTemplates')), mode='r').read()
     for category, template in Config.get_section(CONFIG, 'CMake:Categories').items()
 }

CMake/CMakeLists_itest.txt → CMake/templates/CMakeLists_itest.txt

@@ -12,8 +12,8 @@ set(SOURCE_FILES_TEST
 set( TEST_FILES_BASEDIR ${{CMAKE_SOURCE_DIR}}/examples2 )
 configure_file (
-    ${{CMAKE_SOURCE_DIR}}/CMake/testfiles.hpp.in
-    ${{CMAKE_BINARY_DIR}}/generated/testfiles_basedir.hpp
+    ${{CONFIGURE_HEADERS_SRC_DIR}}/testfiles.hpp.in
+    ${{CONFIGURE_HEADERS_DST_DIR}}/testfiles_basedir.hpp
 )
 add_executable(${{PROJECT_NAME_TEST}} ${{SOURCE_FILES_TEST}})