CMakeLists: Fix logic of BUILD_CPPDAP

set() does not evaluate conditional expressions like if() does. BUILD_CPPDAP was being set to "${BUILD_VULKAN};AND;${ENABLE_VULKAN_DEBUGGER}", so cppdap was always required as a submodule dependency. Bug: b/145351270 Change-Id: I86c3e43b8e22aa283bd2a5a20e0c03c01a965e8a Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39310Reviewed-by: Antonio Maiorano <amaiorano@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com>

CMakeLists: Fix logic of BUILD_CPPDAP
5e4d55f0 · Ben Clayton · 7e0a8c1f · 5e4d55f0
Commit 5e4d55f0 authored Dec 10, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +6 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,12 @@ option(LESS_DEBUG_INFO "Generate less debug info to reduce file size" 0)
 option(ENABLE_VULKAN_DEBUGGER "Enable vulkan debugger support" 0)

 set(BUILD_MARL ${BUILD_VULKAN})
-set(BUILD_CPPDAP ${BUILD_VULKAN} AND ${ENABLE_VULKAN_DEBUGGER})
+
+if(${BUILD_VULKAN} AND ${ENABLE_VULKAN_DEBUGGER})
+    set(BUILD_CPPDAP 1)
+else()
+    set(BUILD_CPPDAP 0)
+endif()

 set(DEFAULT_REACTOR_BACKEND "LLVM")