Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TurTLE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
6efc3f16
Commit
6efc3f16
authored
5 months ago
by
Cristian Lalescu
Browse files
Options
Downloads
Plain Diff
Merge branch 'infra/config_header' into 'master'
changes location of "turtle_config.hpp" See merge request
!136
parents
cfb71ef7
2f9a212b
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!136
changes location of "turtle_config.hpp"
Pipeline
#243118
passed
5 months ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+6
-1
6 additions, 1 deletion
CMakeLists.txt
cpp/CMakeLists.txt
+0
-1
0 additions, 1 deletion
cpp/CMakeLists.txt
cpp/turtle_config.hpp.in
+4
-0
4 additions, 0 deletions
cpp/turtle_config.hpp.in
with
10 additions
and
2 deletions
CMakeLists.txt
+
6
−
1
View file @
6efc3f16
...
...
@@ -316,8 +316,9 @@ if(BUILD_CODE)
configure_file
(
"
${
PROJECT_SOURCE_DIR
}
/cpp/turtle_config.hpp.in"
"
${
PROJECT_
SOURCE_DIR
}
/cpp
/turtle_config.hpp"
"
${
PROJECT_
BINARY_DIR
}
/include
/turtle_config.hpp"
@ONLY
)
include_directories
(
${
PROJECT_BINARY_DIR
}
/include
)
add_subdirectory
(
cpp
)
...
...
@@ -334,6 +335,10 @@ if(BUILD_CODE)
EXPORT TurTLETargets
FILE_SET HEADERS
DESTINATION include/TurTLE
)
install
(
FILES
"
${
PROJECT_BINARY_DIR
}
/include/turtle_config.hpp"
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
DESTINATION include/TurTLE
)
install
(
EXPORT TurTLETargets
FILE TurTLEConfig.cmake
...
...
This diff is collapsed.
Click to expand it.
cpp/CMakeLists.txt
+
0
−
1
View file @
6efc3f16
...
...
@@ -200,7 +200,6 @@ set(hpp_for_lib
${
CMAKE_CURRENT_LIST_DIR
}
/scope_timer.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/shared_array.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/spectrum_function.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/turtle_config.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/turtle_timer.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/vorticity_equation.hpp
)
...
...
This diff is collapsed.
Click to expand it.
cpp/turtle_config.hpp.in
+
4
−
0
View file @
6efc3f16
...
...
@@ -22,6 +22,10 @@
**********************************************************************/
// **Note**: the file `turtle_config.hpp` is generated by CMake from the file
// `cpp/turtle_config.hpp.in`. Editing `turtle_config.hpp` directly will
// generally not work as expected.
#ifndef TURTLE_CONFIG_HPP
#define TURTLE_CONFIG_HPP
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment