Skip to content

Commit

Permalink
Require C++14 (remove support for VS2017)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewScheidecker committed Jan 17, 2020
1 parent 6f1de41 commit a99e352
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ function(WAVM_SET_TARGET_COMPILE_OPTIONS TARGET_NAME)
)

# Target C++11.
target_compile_features(${TARGET_NAME} PUBLIC cxx_std_11)
target_compile_features(${TARGET_NAME} PUBLIC cxx_std_14)

# Set sanitizer options.
WAVM_SET_TARGET_SANITIZER_OPTIONS(${TARGET_NAME})
Expand Down
7 changes: 3 additions & 4 deletions Doc/Building.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Building WAVM from source

To build WAVM, you'll need CMake and [LLVM 9.0](https://github.com/WAVM/WAVM-LLVM/releases/tag/9.x).
To build WAVM, you'll need CMake and [LLVM 9.0+](https://github.com/WAVM/WAVM-LLVM/releases/tag/9.x).
If CMake can't find your LLVM directory, you can manually give it the location in the LLVM_DIR CMake
configuration variable. Note that on Windows, you must compile LLVM from source, and manually point
the LLVM_DIR configuration variable at `<LLVM build directory>\lib\cmake\llvm`.
Expand All @@ -21,7 +21,7 @@ Otherwise, you can download it from the [CMake website](https://cmake.org/downlo

#### Windows

You can use Visual Studio 2017+ to compile WAVM. If you don't have Visual Studio, you can use the
You can use Visual Studio 2019+ to compile WAVM. If you don't have Visual Studio, you can use the
freely available Visual Studio C++ Build Tools for Visual Studio or Visual Studio Community, both
available from the Visual Studio [download page](https://visualstudio.microsoft.com/downloads/).

Expand All @@ -42,8 +42,7 @@ You'll need to install Xcode from the App Store.
cmake <path to WAVM source> -G <generator> -DLLVM_DIR=<path to LLVM build>/lib/cmake/llvm
```
What you pass as `<generator>` depends on your platform:
* For Windows, you'll use either `"Visual Studio 15 2017 Win64"` (aka Visual Studio 2017) or
`"Visual Studio 16 2019"` (aka Visual Studio 2019).
* For Windows, you'll use either `"Visual Studio 16 2019"` (aka Visual Studio 2019).
* For Linux and MacOS, you'll use `"Unix Makefiles"`.

If `cmake` executes successfully, it will create either a Visual Studio solution file or
Expand Down
9 changes: 0 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ stages:
git diff --exit-code
# Win64 VS2017
- template: Build/azure-pipelines/windows-build-job-template.yml
parameters:
name: Win64_VS2017
vsVersion: '2017'
platform: 'x64'
llvmBuildBaseName: 'Win64'
llvmVersion: '9.x'

# Win64 VS2019
- template: Build/azure-pipelines/windows-build-job-template.yml
parameters:
Expand Down

0 comments on commit a99e352

Please sign in to comment.