Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail

This commit is contained in:
Enrico Turri 2019-10-25 08:09:26 +02:00
commit bddde78c9b

View File

@ -271,13 +271,15 @@ if(NOT SLIC3R_STATIC)
endif() endif()
function(slic3r_remap_configs targets from_Cfg to_Cfg) function(slic3r_remap_configs targets from_Cfg to_Cfg)
string(TOUPPER ${from_Cfg} from_CFG) if(MSVC)
string(TOUPPER ${from_Cfg} from_CFG)
foreach(tgt ${targets})
if(TARGET ${tgt}) foreach(tgt ${targets})
set_target_properties(${tgt} PROPERTIES MAP_IMPORTED_CONFIG_${from_CFG} ${to_Cfg}) if(TARGET ${tgt})
endif() set_target_properties(${tgt} PROPERTIES MAP_IMPORTED_CONFIG_${from_CFG} ${to_Cfg})
endforeach() endif()
endforeach()
endif()
endfunction() endfunction()
if(TARGET Boost::system) if(TARGET Boost::system)