Merge branch 'roberthauck-patch-1' into hotfix-1.1.3

2015-09-14 01:51:06 +08:00 · 2015-09-14 01:51:06 +08:00 · fc307d5b99
commit fc307d5b99
parent e97d2cb20f 7ce97727d1
1 changed files with 7 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -36,6 +36,11 @@ if(BIICODE)
        # More MSVC specific compilation flags
 	add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 	add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+	if(MSVC14)
+		add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
+	else()
+		add_definitions(-DNOT_IMPLEMENTED_KEYWORD_noexcept)
+	endif()
    endif()
    
    add_biicode_targets()