commit 1e2fba3088dd90f953905b8105c85a88efe2dad2
author Antonio Maiorano <amaiorano@google.com> Wed Apr 15 16:02:58 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Thu Apr 16 16:00:32 2020 +0000
tree fed37c9b26ede7c078d4e9f78f6982869afab085
parent 8772b42a12456fc2b734afed81120a97d445a285

CMake: make submodule initialization work for add_subdirectory(SwiftShader)

Pass "-C ${SWIFTSHADER_DIR}" to the git submodule command so that it
executes from the SwiftShader directory, and not CMAKE_CURRENT_SOURCE,
which will be an outer directory. Also, make sure to always check if one
target from the submodule already exists to allow parent projects to add
their own version.

Also:
* Refactor submodule init code into function(InitSubmodule)
* Only download libbacktrace if REACTOR_EMIT_DEBUG_INFO is enabled
* Add downloads of json and cppdap if SWIFTSHADER_BUILD_CPPDAP is enabled

Bug: b/145758253
Change-Id: I3bd3f3fcb7f7190f052d2e6f144468bffa0c79da
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43951
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61e0653..e64465c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,58 +184,45 @@
 # Initialize submodules
 ###########################################################
 
-if (SWIFTSHADER_BUILD_TESTS)
-    if (NOT TARGET gtest)
-        if(NOT EXISTS ${THIRD_PARTY_DIR}/googletest/.git)
+function(InitSubmodule target submodule_dir)
+    if (NOT TARGET ${target})
+        if(NOT EXISTS ${submodule_dir}/.git)
             message(WARNING "
-        googletest submodule missing.
+        Target ${target} from submodule ${submodule_dir} missing.
         Running 'git submodule update --init' to download it:
             ")
 
-            execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/googletest)
+            execute_process(COMMAND git -C ${SWIFTSHADER_DIR} submodule update --init ${submodule_dir})
         endif()
     endif()
+endfunction()
+
+if (SWIFTSHADER_BUILD_TESTS)
+    InitSubmodule(gtest ${THIRD_PARTY_DIR}/googletest)
 endif()
 
 if(SWIFTSHADER_BUILD_BENCHMARKS)
-    if (NOT TARGET benchmark::benchmark)
-        if(NOT EXISTS ${THIRD_PARTY_DIR}/benchmark/.git)
-            message(WARNING "
-        benchmark submodule missing.
-        Running 'git submodule update --init' to download it:
-            ")
+    InitSubmodule(benchmark::benchmark ${THIRD_PARTY_DIR}/benchmark)
+endif()
 
-            execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/benchmark)
-        endif()
-    endif()
-endif(SWIFTSHADER_BUILD_BENCHMARKS)
-
-if (NOT TARGET libbacktrace)
-    if(NOT EXISTS ${THIRD_PARTY_DIR}/libbacktrace/src/.git)
-        message(WARNING "
-      libbacktrace/src submodule missing.
-      Running 'git submodule update --init' to download it:
-        ")
-
-        execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/libbacktrace)
-    endif()
+if(REACTOR_EMIT_DEBUG_INFO)
+    InitSubmodule(libbacktrace ${THIRD_PARTY_DIR}/libbacktrace/src)
 endif()
 
 if(SWIFTSHADER_GET_PVR)
-    if(NOT EXISTS ${THIRD_PARTY_DIR}/PowerVR_Examples/.git)
-        message(WARNING "
-        PowerVR_Examples submodule missing.
-        Running 'git submodule update --init' to download it:
-        ")
-
-        execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/PowerVR_Examples)
-    endif()
+    InitSubmodule(PVRCore ${THIRD_PARTY_DIR}/PowerVR_Examples)
     set(SWIFTSHADER_GET_PVR FALSE CACHE BOOL "Check out the PowerVR submodule" FORCE)
 endif()
 if(EXISTS ${THIRD_PARTY_DIR}/PowerVR_Examples/.git)
     set(HAVE_PVR_SUBMODULE TRUE)
 endif()
 
+if(SWIFTSHADER_BUILD_CPPDAP)
+    InitSubmodule(json ${THIRD_PARTY_DIR}/json)
+    InitSubmodule(cppdap ${THIRD_PARTY_DIR}/cppdap)
+endif()
+
+
 ###########################################################
 # Convenience macros
 ###########################################################