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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
103238aa
Commit
103238aa
authored
6 years ago
by
Berenger Bramas
Browse files
Options
Downloads
Patches
Plain Diff
Update to remove source dir from list of include paths
parent
4f1e39a7
No related branches found
No related tags found
1 merge request
!23
WIP: Feature/use cmake
Pipeline
#45047
canceled
6 years ago
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+6
-4
6 additions, 4 deletions
CMakeLists.txt
with
6 additions
and
4 deletions
CMakeLists.txt
+
6
−
4
View file @
103238aa
...
...
@@ -88,13 +88,17 @@ list(APPEND BFPS_LIBS "${FFTW_LIBRARIES}")
include_directories
(
${
FFTW_INCLUDE_DIRS
}
)
link_directories
(
${
FFTW_LIBRARY_DIRS
}
)
#####################################################################################
## Get the links and include from deps
get_property
(
ALL_INCLUDE_DIRS DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
PROPERTY INCLUDE_DIRECTORIES
)
get_property
(
ALL_LINK_DIRS DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
PROPERTY LINK_DIRECTORIES
)
#####################################################################################
## Build the lib
include_directories
(
${
PROJECT_SOURCE_DIR
}
/bfps/cpp
${
PROJECT_SOURCE_DIR
}
/bfps/cpp/particles
${
PROJECT_SOURCE_DIR
}
/bfps/cpp/full_code
)
file
(
GLOB_RECURSE cpp_for_lib
${
PROJECT_SOURCE_DIR
}
/bfps/*.cpp
)
...
...
@@ -111,8 +115,6 @@ install(TARGETS bfps EXPORT BFPS_EXPORT DESTINATION lib/ PUBLIC_HEADER DESTINATI
#####################################################################################
## Export the configuration
get_property
(
ALL_INCLUDE_DIRS DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
PROPERTY INCLUDE_DIRECTORIES
)
get_property
(
ALL_LINK_DIRS DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
PROPERTY LINK_DIRECTORIES
)
configure_file
(
${
PROJECT_SOURCE_DIR
}
/cmake/BFPSConfig.cmake.in
${
PROJECT_BINARY_DIR
}
/BFPSConfig.cmake @ONLY
)
install
(
FILES
"
${
PROJECT_BINARY_DIR
}
/BFPSConfig.cmake"
DESTINATION lib/
)
...
...
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