From 85e244964a6a4eaf1067908981dceae30bc4973e Mon Sep 17 00:00:00 2001 From: Guillaume Paran Date: Tue, 20 Aug 2019 17:41:52 +0200 Subject: [PATCH] [SofaMacros] FIX default module version Do not apply default version to plugins. --- SofaKernel/SofaFramework/SofaMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SofaKernel/SofaFramework/SofaMacros.cmake b/SofaKernel/SofaFramework/SofaMacros.cmake index 891f6326c11..7756283a76c 100644 --- a/SofaKernel/SofaFramework/SofaMacros.cmake +++ b/SofaKernel/SofaFramework/SofaMacros.cmake @@ -487,11 +487,11 @@ macro(sofa_install_targets package_name the_targets include_install_dir) foreach(target ${the_targets}) set(version ${${target}_VERSION}) + string(TOUPPER "${package_name}" package_name_upper) if(version VERSION_GREATER "0.0") set_target_properties(${target} PROPERTIES VERSION "${version}") - elseif(target MATCHES "^Sofa" AND SofaFramework_VERSION) - set_target_properties(${target} PROPERTIES VERSION "${SofaFramework_VERSION}") - elseif(target MATCHES "^Sofa" AND Sofa_VERSION) + elseif(target MATCHES "^Sofa" AND NOT PLUGIN_${package_name_upper} AND Sofa_VERSION) + # Default to Sofa_VERSION for all SOFA modules set_target_properties(${target} PROPERTIES VERSION "${Sofa_VERSION}") endif()