Skip to content
Snippets Groups Projects
Commit 6efc3f16 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

Merge branch 'infra/config_header' into 'master'

changes location of "turtle_config.hpp"

See merge request !136
parents cfb71ef7 2f9a212b
No related branches found
No related tags found
1 merge request!136changes location of "turtle_config.hpp"
Pipeline #243118 passed
...@@ -316,8 +316,9 @@ if(BUILD_CODE) ...@@ -316,8 +316,9 @@ if(BUILD_CODE)
configure_file( configure_file(
"${PROJECT_SOURCE_DIR}/cpp/turtle_config.hpp.in" "${PROJECT_SOURCE_DIR}/cpp/turtle_config.hpp.in"
"${PROJECT_SOURCE_DIR}/cpp/turtle_config.hpp" "${PROJECT_BINARY_DIR}/include/turtle_config.hpp"
@ONLY) @ONLY)
include_directories(${PROJECT_BINARY_DIR}/include)
add_subdirectory(cpp) add_subdirectory(cpp)
...@@ -334,6 +335,10 @@ if(BUILD_CODE) ...@@ -334,6 +335,10 @@ if(BUILD_CODE)
EXPORT TurTLETargets EXPORT TurTLETargets
FILE_SET HEADERS FILE_SET HEADERS
DESTINATION include/TurTLE) DESTINATION include/TurTLE)
install(
FILES "${PROJECT_BINARY_DIR}/include/turtle_config.hpp"
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
DESTINATION include/TurTLE)
install( install(
EXPORT TurTLETargets EXPORT TurTLETargets
FILE TurTLEConfig.cmake FILE TurTLEConfig.cmake
......
...@@ -200,7 +200,6 @@ set(hpp_for_lib ...@@ -200,7 +200,6 @@ set(hpp_for_lib
${CMAKE_CURRENT_LIST_DIR}/scope_timer.hpp ${CMAKE_CURRENT_LIST_DIR}/scope_timer.hpp
${CMAKE_CURRENT_LIST_DIR}/shared_array.hpp ${CMAKE_CURRENT_LIST_DIR}/shared_array.hpp
${CMAKE_CURRENT_LIST_DIR}/spectrum_function.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}/turtle_timer.hpp
${CMAKE_CURRENT_LIST_DIR}/vorticity_equation.hpp) ${CMAKE_CURRENT_LIST_DIR}/vorticity_equation.hpp)
......
...@@ -22,6 +22,10 @@ ...@@ -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 #ifndef TURTLE_CONFIG_HPP
#define TURTLE_CONFIG_HPP #define TURTLE_CONFIG_HPP
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment