diff options
| author |  Rodrigo Locatti | 2020-07-12 19:13:10 -0300 |
|---|---|---|
| committer |  GitHub | 2020-07-12 19:13:10 -0300 |
| commit | b2305dcee0d67c4217c1ddc25ca96fd7e285bfbc (patch) | |
| tree | a589e2ac02fcbe4b99feaf8306f895adbff1fe84 | |
| parent | Merge pull request #4316 from lioncash/cmake-concept (diff) | |
| parent | CMakeLists: Correct boost asio disabling define name (diff) | |
| download | yuzu-b2305dcee0d67c4217c1ddc25ca96fd7e285bfbc.tar.gz yuzu-b2305dcee0d67c4217c1ddc25ca96fd7e285bfbc.tar.xz yuzu-b2305dcee0d67c4217c1ddc25ca96fd7e285bfbc.zip | |
Merge pull request #4317 from lioncash/boost
CMakeLists: Correct boost asio disabling define name
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 174ed1c58..99476c55f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -124,7 +124,7 @@ if (MSVC) | |||
| 124 | # cubeb and boost still make use of deprecated result_of. | 124 | # cubeb and boost still make use of deprecated result_of. |
| 125 | add_definitions(-D_HAS_DEPRECATED_RESULT_OF) | 125 | add_definitions(-D_HAS_DEPRECATED_RESULT_OF) |
| 126 | # boost asio's concept usage doesn't play nicely with MSVC yet. | 126 | # boost asio's concept usage doesn't play nicely with MSVC yet. |
| 127 | add_definitions(-DASIO_DISABLE_CONCEPTS) | 127 | add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) |
| 128 | else() | 128 | else() |
| 129 | set(CMAKE_CXX_STANDARD 17) | 129 | set(CMAKE_CXX_STANDARD 17) |
| 130 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | 130 | set(CMAKE_CXX_STANDARD_REQUIRED ON) |