[incubator-mxnet] branch master updated: Improve cmake flags (#13109)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhasheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 38eeb0c  Improve cmake flags (#13109)
38eeb0c is described below

commit 38eeb0c20333fa065941204523ba881c8c01ad44
Author: Tao Lv <ta...@intel.com>
AuthorDate: Wed Nov 21 10:50:52 2018 +0800

    Improve cmake flags (#13109)
    
    * change CMAKE_CXX_FLAGS
    
    * change cxx flags for mkldnn
    
    * limit change to MSVC
    
    * Revert "change CMAKE_CXX_FLAGS"
    
    This reverts commit bc67ed382ea6fdae059a7e190f994ec2330ae403.
    
    * retrigger ci
---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b8dda2..3b8bbd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,11 @@ if(USE_MKLDNN)
   # CPU architecture (e.g., C5) can't run on another architecture (e.g., g3).
   if(NOT MSVC)
     set(ARCH_OPT_FLAGS "-mtune=generic")
+  else()
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /Gy")
   endif()
+
   set(WITH_TEST OFF CACHE INTERNAL "" FORCE)
   set(WITH_EXAMPLE OFF CACHE INTERNAL "" FORCE)
   set(ARCH_OPT_FLAGS "" CACHE INTERNAL "" FORCE)