[All] CMake and includes massive clean #1397
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add default target_include_directories -
- Add a SofaFramework library (collection) - Clean SofaFramework source tree - Clean and consistent config.h for SofaCore, SofaDefaultType, SofaHelper, SofaSimulationCore -> core.h, defaulttype.h, helper.h and simulationcore.h are kept for backward compatibility
- Add a SofaSimulation library (collection) - Clean SofaSimulation source tree - Clean and consistent config.h for SofaSimulationCommon, SofaSimulationGraph, SofaSimulationTree -> common.h, graph.h and tree.h are kept for backward compatibility
- Add a SofaGui library (collection) - Clean SofaGui source tree
- Add default target_include_directories for BUILD_INTERFACE and INSTALL_INTERFACE - Add default target_compile_definitions for SOFA_BUILD_SOFAMODULENAME + SOFA_BUILD_MODULE_NAME (legacy)
unneeded include dir
hugtalbot
reviewed
Jun 16, 2020
| @@ -22,7 +23,5 @@ set(SOURCE_FILES | |||
|
|
|||
| add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES}) | |||
| target_link_libraries(${PROJECT_NAME} PUBLIC SofaSimulationCommon) | |||
| set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_d") | |||
| set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DSOFA_BUILD_SIMULATION_TREE") | |||
There was a problem hiding this comment.
Yup that's the point of this PR 👍
hugtalbot
reviewed
Jun 17, 2020
| # if(NOT "${include_source_root}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}/..") | ||
| # get_target_property(target_include_dirs ${target} "INCLUDE_DIRECTORIES") | ||
| # message("${target}: target_include_directories: ${target_include_dirs}") | ||
| # endif() |
guparan
added
pr: status wip
guparan
force-pushed
the
cmake_massive_clean
branch
from
4edc081
to
4d5ffec
Compare
|
[ci-build][with-all-tests] |
guparan
added
pr: status to review
|
The CI does not look happy, but I think it's nothing: for Linux: some permission error at CMake phase and Windows:
|
hugtalbot
added
pr: status ready
6 tasks
6 tasks
6 tasks
alxbilger
pushed a commit
to alxbilger/sofa
that referenced
this pull request
Oct 27, 2023
[All] CMake and includes massive clean
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hard to do some cleaning in CMakeLists without touching all SOFA files!
This PR contains:
Default properties for targets calling sofa_generate_package or sofa_install_targets
Cleaning of config.h mechanism (consistency with all other SOFA modules)
-> WARNING: maybe not a good idea, review needed here
Moving SofaGui modules into "modules" directory + cleaning their source trees
Every package is now also a library. Work started by @fredroy in #1314, 3 packages remained
Cleaning source trees to eliminate some ".." include directories
(files move but includes stay the same)
Fix #1395 by removing "relocatable" attribute from SofaNonUniformFem, SofaValidation, SofaDenseSolver.