From e4da7264cfd39fb758ccb8bf941214565a62ac40 Mon Sep 17 00:00:00 2001 From: Fergus Cooper Date: Thu, 29 Sep 2016 11:29:56 +0100 Subject: [PATCH] Change template to template_project so project comiles --- CMakeLists.txt | 2 +- apps/CMakeLists.txt | 2 +- setup_project.py | 6 +++--- test/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ece5acd1..37e80076 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,4 +19,4 @@ find_package(Chaste COMPONENTS continuum_mechanics global io linalg mesh ode pde # Change the project name in the line below to match the folder this file is in, # i.e. the name of your project. -chaste_do_project(template) +chaste_do_project(template_project) diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 90a01cbf..439d427f 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -3,4 +3,4 @@ # This allows us to build executables (apps) using the project. # Simply set the project name in the line below. -chaste_do_apps_project(template) +chaste_do_apps_project(template_project) diff --git a/setup_project.py b/setup_project.py index 58ccaeb4..c101a894 100644 --- a/setup_project.py +++ b/setup_project.py @@ -80,9 +80,9 @@ def main(): test_cmakelists = os.path.join(path_to_project, 'test', 'CMakeLists.txt') # Perform the find-and-replace tasks to update the template project - find_and_replace(base_cmakelists, 'chaste_do_project(template', 'chaste_do_project(' + project_name) - find_and_replace(apps_cmakelists, 'chaste_do_apps_project(template', 'chaste_do_apps_project(' + project_name) - find_and_replace(test_cmakelists, 'chaste_do_test_project(template', 'chaste_do_test_project(' + project_name) + find_and_replace(base_cmakelists, 'chaste_do_project(template_project', 'chaste_do_project(' + project_name) + find_and_replace(apps_cmakelists, 'chaste_do_apps_project(template_project', 'chaste_do_apps_project(' + project_name) + find_and_replace(test_cmakelists, 'chaste_do_test_project(template_project', 'chaste_do_test_project(' + project_name) # Amend the components components_list = [] diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 192ff206..c6bfa5da 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,4 +3,4 @@ # This allows us to build tests of the project. # Simply set the project name in the line below. -chaste_do_test_project(template) +chaste_do_test_project(template_project)