diff options
| author | Ben Clayton <bclayton@google.com> | 2020-01-17 18:20:58 +0000 |
|---|---|---|
| committer | dan sinclair <dsinclair@google.com> | 2020-01-17 13:20:57 -0500 |
| commit | 9221e1f7f337bffa87c972dcd16b17f083ae5665 (patch) | |
| tree | bbdb15e6337c81f8acfcd3ec61504384551ee94c /third_party | |
| parent | 42eda81eba7e6ca9d0ddd500931eeb53e6c495c5 (diff) | |
| download | amber-9221e1f7f337bffa87c972dcd16b17f083ae5665.tar.gz | |
Roll SwiftShader forward (#768)
Repoint SwiftShader to 2cb1db08.
Update CMake build flags after a renaming spree.
SwiftShader has also moved to C++14, so set `CMAKE_CXX_STANDARD` to 14
when `AMBER_ENABLE_SWIFTSHADER` is enabled. Also use GCC 7, which can
correctly compile C++14.
Fixes: #763
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 20781f6..b5bd5d7 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -66,13 +66,13 @@ if (${AMBER_USE_LOCAL_VULKAN}) endif() if (${AMBER_ENABLE_SWIFTSHADER}) - set(BUILD_EGL FALSE CACHE BOOL FALSE) - set(BUILD_GLESv2 FALSE CACHE BOOL FALSE) - set(BUILD_GLES_CM FALSE CACHE BOOL FALSE) - set(BUILD_VULKAN TRUE CACHE BOOL TRUE) - set(BUILD_SAMPLES FALSE CACHE BOOL FALSE) - set(BUILD_TESTS FALSE CACHE BOOL FALSE) - set(WARNINGS_AS_ERRORS FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_BUILD_EGL FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_BUILD_GLESv2 FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_BUILD_GLES_CM FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_BUILD_VULKAN TRUE CACHE BOOL TRUE) + set(SWIFTSHADER_BUILD_SAMPLES FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_BUILD_TESTS FALSE CACHE BOOL FALSE) + set(SWIFTSHADER_WARNINGS_AS_ERRORS FALSE CACHE BOOL FALSE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/swiftshader) endif() |