Skip to content

Commit

Permalink
Update for Visual Studio 2019
Browse files Browse the repository at this point in the history
  • Loading branch information
rhysgoldstein committed Dec 16, 2020
1 parent 94db051 commit ad069a2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
1 change: 1 addition & 0 deletions src/sydevs/core/number_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <stdint.h>
#include <limits>
#include <stdexcept>

namespace sydevs {

Expand Down
1 change: 0 additions & 1 deletion src/sydevs/core/range.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#define SYDEVS_RANGE_H_

#include <sydevs/core/number_types.h>
#include <stdexcept>

namespace sydevs {

Expand Down

0 comments on commit ad069a2

Please sign in to comment.