Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[All] Fix SOFA_LIBSUFFIX used in Debug by PluginManager #1313

Merged
merged 2 commits into from
Apr 8, 2020
Merged

[All] Fix SOFA_LIBSUFFIX used in Debug by PluginManager #1313

merged 2 commits into from
Apr 8, 2020

Conversation

epernod
Copy link
Contributor

@epernod epernod commented Apr 2, 2020

The path to the pluginManager.cpp is incomplete in the CMakeLists.

Thus prefix was always empty and nod set to _d in debug mode.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@epernod epernod added pr: fix Fix a bug pr: status to review To notify reviewers to review this pull-request labels Apr 2, 2020
@epernod epernod requested a review from guparan April 2, 2020 21:06
@epernod epernod self-assigned this Apr 2, 2020
guparan
guparan suggested changes Apr 6, 2020
View reviewed changes
Copy link
Contributor

@guparan guparan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix @epernod
I only suggest to use SRC_ROOT instead of plain path for better maintainability.

SofaKernel/modules/SofaHelper/CMakeLists.txt Outdated
@@ -334,7 +334,8 @@ endif()
# since this is configuration specific it is a bit more convenient to put it as a debug compile definition for
# PluginManager.cpp, at the expense of being much less visible compare to having it in the generated
# SofaFramework/config.h
set_property(SOURCE system/PluginManager.cpp APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG "SOFA_LIBSUFFIX=_d" )
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/sofa/helper/system/PluginManager.cpp APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG "SOFA_LIBSUFFIX=_d" )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

set_property(SOURCE ${SRC_ROOT}/system/PluginManager.cpp APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG "SOFA_LIBSUFFIX=_d")

@guparan guparan merged commit decca5a into sofa-framework:master Apr 8, 2020
@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Apr 8, 2020
@epernod epernod deleted the inf_plugin_debug branch April 29, 2020 08:41
@guparan guparan added this to the v20.06 milestone Jun 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guparan guparan guparan requested changes

@fredroy fredroy fredroy approved these changes

Assignees

@epernod epernod

Labels
pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v20.06
Development

Successfully merging this pull request may close these issues.
3 participants
@epernod @guparan @fredroy