From abf10ffc0f08f3a343a353fc08131922b145699c Mon Sep 17 00:00:00 2001 From: erik pernod Date: Thu, 2 Apr 2020 19:43:48 +0200 Subject: [PATCH 1/2] [SofaKernel] Fix SOFA_LIBSUFFIX used in Debug by PluginManager --- SofaKernel/modules/SofaHelper/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SofaKernel/modules/SofaHelper/CMakeLists.txt b/SofaKernel/modules/SofaHelper/CMakeLists.txt index 9e9292368d6..9e9b5d10a9a 100644 --- a/SofaKernel/modules/SofaHelper/CMakeLists.txt +++ b/SofaKernel/modules/SofaHelper/CMakeLists.txt @@ -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" ) + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DSOFA_BUILD_HELPER") set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_d") set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${SOFAFRAMEWORK_VERSION}") From 17cc674a9485fba252d90e288a01f73e4618df7d Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Wed, 8 Apr 2020 09:52:28 +0200 Subject: [PATCH 2/2] [SofaHelper] CLEAN CMakeLists set_property --- SofaKernel/modules/SofaHelper/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SofaKernel/modules/SofaHelper/CMakeLists.txt b/SofaKernel/modules/SofaHelper/CMakeLists.txt index 9e9b5d10a9a..59a9c63f304 100644 --- a/SofaKernel/modules/SofaHelper/CMakeLists.txt +++ b/SofaKernel/modules/SofaHelper/CMakeLists.txt @@ -334,7 +334,7 @@ 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 ${CMAKE_CURRENT_SOURCE_DIR}/src/sofa/helper/system/PluginManager.cpp APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG "SOFA_LIBSUFFIX=_d" ) +set_property(SOURCE ${SRC_ROOT}/system/PluginManager.cpp APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG "SOFA_LIBSUFFIX=_d" ) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DSOFA_BUILD_HELPER") set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_d")