From ad069a23cb85ee3f64c31d3668d5dc582a7b259e Mon Sep 17 00:00:00 2001 From: Rhys Goldstein Date: Wed, 16 Dec 2020 10:19:47 -0500 Subject: [PATCH] Update for Visual Studio 2019 --- CMakeLists.txt | 4 ++-- README.md | 2 +- src/sydevs/core/number_types.h | 1 + src/sydevs/core/range.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebe53013..208ff235 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ################################################################################ # CMake File for SyDEVS ################################################################################ -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.10) project(SyDEVS) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD 14) if(MSVC) add_definitions("/wd4244") # Hide type conversion warnings add_compile_options(/MP) - add_compile_options(/std=c++${CMAKE_CXX_STANDARD}) + add_compile_options(/std:c++${CMAKE_CXX_STANDARD}) string(REGEX REPLACE "/Z[iI7]" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Z7 /bigobj") else() diff --git a/README.md b/README.md index 5cb78655..3b4b064a 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ This folder contains the elements from which dataflow + message-passing networks * Make sure you have [Visual Studio 2015](https://www.visualstudio.com) or [Visual Studio 2017](https://www.visualstudio.com) * `mkdir build` * `cd build/` -* `cmake -G "Visual Studio 14 2015 Win64" ..` or `cmake -G "Visual Studio 15 2017 Win64" ..` +* `cmake -G "Visual Studio 14 2015 Win64" ..` or `cmake -G "Visual Studio 15 2017 Win64" ..` or `cmake -G "Visual Studio 16 2019" -A x64 ..` * Open `build/SyDEVS.sln` in Visual Studio * Recommendation: In `Tools -> Options -> Text Editor -> C/C++ -> Tabs`, select `Insert spaces` with a `Tab size` and `Indent size` of `4` diff --git a/src/sydevs/core/number_types.h b/src/sydevs/core/number_types.h index 15fffa4e..c26b51aa 100644 --- a/src/sydevs/core/number_types.h +++ b/src/sydevs/core/number_types.h @@ -4,6 +4,7 @@ #include #include +#include namespace sydevs { diff --git a/src/sydevs/core/range.h b/src/sydevs/core/range.h index 0081b2bf..d3e2aefa 100644 --- a/src/sydevs/core/range.h +++ b/src/sydevs/core/range.h @@ -3,7 +3,6 @@ #define SYDEVS_RANGE_H_ #include -#include namespace sydevs {