commit 13943bad95d0f5f9b0e19121070937cfdae34bf9
author Nicolas Capens <capn@google.com> Tue Mar 17 22:36:24 2020 -0400
committer Nicolas Capens <nicolascapens@google.com> Sun Mar 29 03:41:31 2020 +0000
tree 1ea411f3d7404bc26f528f297e7b30413db60a85
parent 536e2c8007dd71fed8b8f2ac2d504388a50542af

Create PowerVR targets if submodule already exists

If the PowerVR_Examples submodule has been checked out, enable creating
the CMake targets for them. This helps make them available in all
configurations in Visual Studio, without editing the cache for each of
them individually.

Bug: b/141361933
Change-Id: I700407be4c6b89866856b0c4f2d6ae55180c4fcd
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/42488
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33e0f17..e64a136 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,8 @@
 option_if_not_defined(SWIFTSHADER_BUILD_GLESv2 "Build the OpenGL ES 2 library" TRUE)
 option_if_not_defined(SWIFTSHADER_BUILD_GLES_CM "Build the OpenGL ES 1.1 library" TRUE)
 option_if_not_defined(SWIFTSHADER_BUILD_VULKAN "Build the Vulkan library" TRUE)
-option_if_not_defined(SWIFTSHADER_BUILD_PVR "Fetch and build the PowerVR examples" FALSE)
+option_if_not_defined(SWIFTSHADER_BUILD_PVR "Build the PowerVR examples" TRUE)
+option_if_not_defined(SWIFTSHADER_GET_PVR "Check out the PowerVR submodule" FALSE)
 
 option_if_not_defined(SWIFTSHADER_USE_GROUP_SOURCES "Group the source files in a folder tree for Visual Studio" TRUE)
 
@@ -260,7 +261,7 @@
     endif()
 endfunction()
 
-if (SWIFTSHADER_BUILD_PVR)
+if(SWIFTSHADER_GET_PVR)
     if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples/.git)
         message(WARNING "
         third_party/PowerVR_Examples submodule missing.
@@ -269,7 +270,10 @@
 
         execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples)
     endif()
-    set(PVR_BUILD_EXAMPLES TRUE CACHE BOOL "Build the PowerVR SDK Examples" FORCE)
+    set(SWIFTSHADER_GET_PVR FALSE CACHE BOOL "Check out the PowerVR submodule" FORCE)
+endif()
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples/.git)
+    set(HAVE_PVR_SUBMODULE TRUE)
 endif()
 
 ###########################################################
@@ -1533,7 +1537,7 @@
     target_link_libraries(vk-unittests ${OS_LIBS} SPIRV-Tools ${SWIFTSHADER_LIBS})
 endif(SWIFTSHADER_BUILD_TESTS AND SWIFTSHADER_BUILD_VULKAN)
 
-if(SWIFTSHADER_BUILD_PVR)
+if(HAVE_PVR_SUBMODULE AND SWIFTSHADER_BUILD_PVR)
     if(UNIX AND NOT APPLE)
         set(PVR_WINDOW_SYSTEM XCB)
 
@@ -1542,6 +1546,7 @@
         set(CMAKE_BUILD_RPATH "$ORIGIN")
     endif()
 
+    set(PVR_BUILD_EXAMPLES TRUE CACHE BOOL "Build the PowerVR SDK Examples" FORCE)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples)
 
     if(NOT APPLE)