From 8a6d61329ff33eace23b025457f036d1543c70c4 Mon Sep 17 00:00:00 2001 From: Peter Lama Date: Fri, 2 Jun 2017 06:25:50 +0200 Subject: [PATCH] py3: win: Link required vc14 CRT libs issue 0000995 --- src/3rdParty/salomesmesh/CMakeLists.txt | 10 ++++++++++ src/Mod/Path/libarea/CMakeLists.txt | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 7818e66adc..303ae6e0aa 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -72,6 +72,16 @@ if(MSVC) ${OCC_OCAF_LIBRARIES} ) endif(BUILD_FEM_NETGEN) + + #Universal C runtime introduced in VS 2015 (cl version 19) + if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19")) + list(APPEND SMESH_LIBS + debug vcruntimed.lib + debug ucrtd.lib + optimized vcruntime.lib + optimized ucrt.lib + ) + endif() else(MSVC) if(BUILD_FEM_NETGEN) set(SMESH_LIBS diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt index 6e489b6382..219ec1e5c7 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt +++ b/src/Mod/Path/libarea/CMakeLists.txt @@ -84,6 +84,17 @@ if(MSVC) optimized MSVCRT.LIB optimized MSVCPRT.LIB ) + + #Universal C runtime introduced in VS 2015 (cl version 19) + if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19")) + list(APPEND area_native_LIBS + debug vcruntimed.lib + debug ucrtd.lib + optimized vcruntime.lib + optimized ucrt.lib + ) + endif() + set(area_LIBS ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}