diff options
| author | Ben Clayton <bclayton@google.com> | 2020-01-29 16:34:38 +0000 |
|---|---|---|
| committer | Ben Clayton <bclayton@google.com> | 2020-01-31 09:46:38 +0000 |
| commit | 560e3cf8f49385461ea625d78fe90955b1637fb9 (patch) | |
| tree | cd0455d4f08b0f0a5b831fc1b8e59c5e94a9979c /third_party | |
| parent | 96d943eba504e18243272585d7783dc3d60da685 (diff) | |
| download | amber-560e3cf8f49385461ea625d78fe90955b1637fb9.tar.gz | |
Update dependencies and build for debugger
Add the new third_party dependencies:
• github.com/google/cppdap
• github.com/nlohmann/json (required by cppdap)
Add the `AMBER_ENABLE_VK_DEBUGGING` option to CMake. This builds and links `cppdap`, but is not currrently referenced in code.
Rolled SwiftShader forward, and passed required CMake debugger build flags down.
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/CMakeLists.txt | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index b5bd5d7..3cf9058 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -65,14 +65,25 @@ if (${AMBER_USE_LOCAL_VULKAN}) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vulkan-validationlayers) endif() +if (${AMBER_ENABLE_VK_DEBUGGING}) + set(CPPDAP_JSON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/json) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cppdap) +endif() + if (${AMBER_ENABLE_SWIFTSHADER}) - 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) + set(SWIFTSHADER_BUILD_EGL FALSE) + set(SWIFTSHADER_BUILD_GLESv2 FALSE) + set(SWIFTSHADER_BUILD_GLES_CM FALSE) + set(SWIFTSHADER_BUILD_VULKAN TRUE) + set(SWIFTSHADER_BUILD_SAMPLES FALSE) + set(SWIFTSHADER_BUILD_TESTS FALSE) + set(SWIFTSHADER_WARNINGS_AS_ERRORS FALSE) + + if (${AMBER_ENABLE_VK_DEBUGGING}) + set(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER TRUE) + set(SWIFTSHADER_BUILD_CPPDAP FALSE) # Already built above + endif (${AMBER_ENABLE_VK_DEBUGGING}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/swiftshader) endif() |