-
Notifications
You must be signed in to change notification settings - Fork 311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[All] CMake and includes massive clean #1397
[All] CMake and includes massive clean #1397
Conversation
- 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
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
normal ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup that's the point of this PR 👍
# 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() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commented ?
4edc081
to
4d5ffec
Compare
[ci-build][with-all-tests] |
The CI does not look happy, but I think it's nothing: for Linux: some permission error at CMake phase and Windows:
|
[All] CMake and includes massive clean
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.