From f21ceb0fac24e97b0d48c67cd44c17fe6efb18ae Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 14 Sep 2015 12:37:28 +0200 Subject: [PATCH] Add VS2015 Linker fix also for Cmake --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fbd6ed5..2c82d2b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,12 @@ cmake_minimum_required(VERSION 2.8) if(WIN32) add_definitions(-DNANA_WINDOWS) add_definitions(-DPLATFORM_SPEC_HPP=) - + if(MSVC14) + add_definitions(-DSTD_CODECVT_NOT_SUPPORTED) + else() + add_definitions(-DNOT_IMPLEMENTED_KEYWORD_noexcept) + endif() + #Test if it is MINGW if(MINGW) add_definitions(-DNANA_MINGW)