Commit aae80113 authored by Mohcine Chraibi's avatar Mohcine Chraibi

Merge branch 'develop' of https://gitlab.version.fz-juelich.de/jupedsim/jpscore into develop

parents fca0e748 adcb4415
Pipeline #10536 failed with stages
in 6 minutes and 21 seconds
...@@ -516,6 +516,7 @@ math/VelocityModel.h ...@@ -516,6 +516,7 @@ math/VelocityModel.h
math/OperationalModel.h math/OperationalModel.h
poly2tri/poly2tri.h poly2tri/poly2tri.h
poly2tri/common/shapes.h poly2tri/common/shapes.h
poly2tri/sweep/cdt.h poly2tri/sweep/cdt.h
...@@ -736,6 +737,9 @@ endif () ...@@ -736,6 +737,9 @@ endif ()
if (MSVC) if (MSVC)
message(STATUS "MSVC: " ${MSVC}) message(STATUS "MSVC: " ${MSVC})
#add_compile_options(cnpy PRIVATE "/W4" "WX-")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /WX-")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /WX-")
elseif (MSVC_IDE) elseif (MSVC_IDE)
message(STATUS "MSVC_IDE: " ${MSVC_IDE}) message(STATUS "MSVC_IDE: " ${MSVC_IDE})
elseif(MSVC60) elseif(MSVC60)
...@@ -752,6 +756,8 @@ elseif(MSVC12) ...@@ -752,6 +756,8 @@ elseif(MSVC12)
message(STATUS "MSVC12: " ${MSVC12}) message(STATUS "MSVC12: " ${MSVC12})
elseif(MSVC13) elseif(MSVC13)
message(STATUS "MSVC13: " ${MSVC13}) message(STATUS "MSVC13: " ${MSVC13})
elseif(MSVC14)
message(STATUS "MSVC14: " ${MSVC14})
endif() endif()
#--------------------- #---------------------
message(STATUS "C++ Compiler: " ${CMAKE_CXX_COMPILER}) message(STATUS "C++ Compiler: " ${CMAKE_CXX_COMPILER})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment