From 82adea068e0ff46055f41ab0f8a48f30f5d45c95 Mon Sep 17 00:00:00 2001
From: Martin Beseda <martinbeseda@seznam.cz>
Date: Sun, 9 Sep 2018 20:57:44 +0200
Subject: [PATCH] Trying to fix CI
---
CMakeLists.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f16bc644..8f743594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(lib4neuro)
#TODO rewrite to use add_compile_definitions
if(WIN32)
- add_compile_options("-DBOOST_ALL_NO_LIB /W0")
+ add_compile_options("-DBOOST_ALL_NO_LIB")
else()
add_compile_options("-DBOOST_TEST_DYN_LINK")
endif()
@@ -34,10 +34,15 @@ endif()
# Setting C++ compiler flags #
#--------------------------------#
set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
+
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost" )
+elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" )
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
+else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
endif()
#--------------------#
--
GitLab