[cmake] Check for deps before adding.

When embedding SwitftShader into a third party application, the top level cmake files may already include googletest and SPIRV-Tools. This CL updates the SwiftShader tests to only try to pull in googletest if the `gtest` target is not found and only pull in SPIRV-Tools if the `SPIRV-Tools` target is not found. Change-Id: I3c3ebb528725017dbbb80aa05b01ee2de8d4a2d1 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/26788Reviewed-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Dan Sinclair <dsinclair@google.com>

[cmake] Check for deps before adding.
6480d4e1 · Dan Sinclair · 25ec7b0c · 6480d4e1
Commit 6480d4e1 authored Mar 11, 2019 by Dan Sinclair
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 11 deletions

CMakeLists.txt CMakeLists.txt +15 -11

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,13 +109,15 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Initialize submodules
 ###########################################################
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/.git)
+if (NOT TARGET gtest)
-    message(WARNING "
+    if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/.git)
-  third_party/googletest submodule missing.
+        message(WARNING "
-  Running 'git submodule update --init' to download it:
+      third_party/googletest submodule missing.
-    ")
+      Running 'git submodule update --init' to download it:
+        ")
-    execute_process(COMMAND git submodule update --init)
+        execute_process(COMMAND git submodule update --init)
+    endif()
 endif()
 ###########################################################
@@ -2234,11 +2236,13 @@ if(BUILD_GLES_CM)
 endif()
 if(BUILD_VULKAN)
-    # This variable is also used by SPIRV-Tools to locate SPIRV-Headers
+    if (NOT TARGET SPIRV-Tools)
-    set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/SPIRV-Headers")
+        # This variable is also used by SPIRV-Tools to locate SPIRV-Headers
-    list(APPEND VULKAN_INCLUDE_DIR "${SPIRV-Headers_SOURCE_DIR}/include")
+        set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/SPIRV-Headers")
+        list(APPEND VULKAN_INCLUDE_DIR "${SPIRV-Headers_SOURCE_DIR}/include")
-    add_subdirectory(third_party/SPIRV-Tools)
+        add_subdirectory(third_party/SPIRV-Tools)
+    endif()
    add_library(libvk_swiftshader SHARED ${VULKAN_LIST})
    set_target_properties(libvk_swiftshader PROPERTIES