Skip to content
Snippets Groups Projects
Commit 07c31eec authored by Tomáš Pecka's avatar Tomáš Pecka Committed by Tomáš Pecka
Browse files

CMake: Move headers, templates and modules to separate directories

parent 75002693
No related branches found
No related tags found
1 merge request!64Dev tp
Showing
with 7 additions and 6 deletions
../contrib/catch2/Catch.cmake
\ No newline at end of file
../contrib/catch2/CatchAddTests.cmake
\ No newline at end of file
../../contrib/catch2/Catch.cmake
\ No newline at end of file
../../contrib/catch2/CatchAddTests.cmake
\ No newline at end of file
File moved
File moved
File moved
File moved
../../contrib/catch2/ParseAndAddCatchTests.cmake
\ No newline at end of file
File moved
File moved
File moved
../contrib/catch2/ParseAndAddCatchTests.cmake
\ No newline at end of file
......@@ -7,6 +7,7 @@ patch = 1
[General]
ProjectConfFile: project.conf
PathToSources: ..
PathToTemplates: ./templates/
 
[Groups]
cli
......
......@@ -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()
}
 
......
File moved
File moved
File moved
......@@ -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}})
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment