CMake: fix add_subdirectory(SwiftShader)

Essentially, do not assume CMAKE_SOURCE_DIR is the SwiftShader root directory. Instead, we now set SWIFTSHADER_DIR in the root CMakeLists, and use that everywhere. Bug: b/145758253 Change-Id: I4968d0dc06ebd8e45791f7cd956e5aeeefddd54f Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43949 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Antonio Maiorano <amaiorano@google.com>

CMake: fix add_subdirectory(SwiftShader)
8772b42a · Antonio Maiorano · da4315d2 · 8772b42a · 8772b42a · 8772b42a
Commit 8772b42a authored Apr 15, 2020 by Antonio Maiorano
10 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,9 +175,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS TRUE)
 # Directories
 ###########################################################

-set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
-set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
-set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+set(SWIFTSHADER_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(SOURCE_DIR ${SWIFTSHADER_DIR}/src)
+set(THIRD_PARTY_DIR ${SWIFTSHADER_DIR}/third_party)
+set(TESTS_DIR ${SWIFTSHADER_DIR}/tests)

 ###########################################################
 # Initialize submodules
@@ -242,13 +243,13 @@ endif()
 # Recursively calls source_group on the files of the directory
 # so that Visual Studio has the files in a folder tree
 macro(group_all_sources directory)
-    file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${directory} ${CMAKE_CURRENT_SOURCE_DIR}/${directory}/*)
+    file(GLOB files RELATIVE ${SWIFTSHADER_DIR}/${directory} ${SWIFTSHADER_DIR}/${directory}/*)
    foreach(file ${files})
-        if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${directory}/${file})
+        if(IS_DIRECTORY ${SWIFTSHADER_DIR}/${directory}/${file})
            group_all_sources(${directory}/${file})
        else()
            string(REPLACE "/" "\\" groupname ${directory})
-            source_group(${groupname} FILES ${CMAKE_CURRENT_SOURCE_DIR}/${directory}/${file})
+            source_group(${groupname} FILES ${SWIFTSHADER_DIR}/${directory}/${file})
        endif()
    endforeach()
 endmacro()
@@ -618,15 +619,6 @@ if(SWIFTSHADER_BUILD_TESTS)
 endif()

 ###########################################################
-# Include Directories
-###########################################################
-
-set(VULKAN_INCLUDE_DIR
-    ${SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
-###########################################################
 # File Lists
 ###########################################################


--- a/src/Device/CMakeLists.txt
+++ b/src/Device/CMakeLists.txt
@@ -65,7 +65,7 @@ set_target_properties(vk_device PROPERTIES
 target_include_directories(vk_device
    PUBLIC
        ".."
-        "${CMAKE_SOURCE_DIR}/include"
+        "${SWIFTSHADER_DIR}/include"
 )

 target_compile_options(vk_device

--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -68,7 +68,7 @@ target_include_directories(gl_main
    PUBLIC
        ".."
    PRIVATE
-        ${CMAKE_SOURCE_DIR}/include # For EGL
+        ${SWIFTSHADER_DIR}/include # For EGL
 )

 target_compile_definitions(gl_main

--- a/src/OpenGL/common/CMakeLists.txt
+++ b/src/OpenGL/common/CMakeLists.txt
@@ -49,8 +49,8 @@ set_target_properties(libGLESCommon PROPERTIES
 target_include_directories(libGLESCommon
    PUBLIC
        ".."
-        "${CMAKE_SOURCE_DIR}/include"
-        "${CMAKE_SOURCE_DIR}/src"
+        "${SWIFTSHADER_DIR}/include"
+        "${SWIFTSHADER_DIR}/src"
 )

 target_compile_definitions(libGLESCommon

--- a/src/OpenGL/compiler/CMakeLists.txt
+++ b/src/OpenGL/compiler/CMakeLists.txt
@@ -133,8 +133,8 @@ set_target_properties(GLCompiler PROPERTIES
 target_include_directories(GLCompiler
    PRIVATE
        ".."
-        "${CMAKE_SOURCE_DIR}/include"
-        "${CMAKE_SOURCE_DIR}/src"
+        "${SWIFTSHADER_DIR}/include"
+        "${SWIFTSHADER_DIR}/src"
 )

 target_compile_definitions(GLCompiler

--- a/src/Pipeline/CMakeLists.txt
+++ b/src/Pipeline/CMakeLists.txt
@@ -93,7 +93,7 @@ set_target_properties(vk_pipeline PROPERTIES
 target_include_directories(vk_pipeline
    PUBLIC
        ".."
-        "${CMAKE_SOURCE_DIR}/include"
+        "${SWIFTSHADER_DIR}/include"
        "${SPIRV-Headers_SOURCE_DIR}/include"
        "${SPIRV_TOOLS_EXT_INC_DIR}"
 )

--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -155,7 +155,6 @@ set_target_properties(vk_swiftshader PROPERTIES
 target_include_directories(vk_swiftshader
    PRIVATE
        ".."
-        # "${CMAKE_SOURCE_DIR}/include"
 )

 target_compile_options(vk_swiftshader

--- a/src/WSI/CMakeLists.txt
+++ b/src/WSI/CMakeLists.txt
@@ -66,7 +66,7 @@ set_target_properties(vk_wsi PROPERTIES
 target_include_directories(vk_wsi
    PUBLIC
        ".."
-        "${CMAKE_SOURCE_DIR}/include"
+        "${SWIFTSHADER_DIR}/include"
 )

 target_compile_options(vk_wsi

--- a/tests/GLESUnitTests/CMakeLists.txt
+++ b/tests/GLESUnitTests/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(gles-unittests PROPERTIES

 target_include_directories(gles-unittests
    PRIVATE
-        "${CMAKE_SOURCE_DIR}/include"
+        "${SWIFTSHADER_DIR}/include"
 )

 target_compile_definitions(gles-unittests

--- a/tests/VulkanUnitTests/CMakeLists.txt
+++ b/tests/VulkanUnitTests/CMakeLists.txt
@@ -50,7 +50,7 @@ set_target_properties(vk-unittests PROPERTIES

 target_include_directories(vk-unittests
    PRIVATE
-        "${CMAKE_SOURCE_DIR}/include"
+        "${SWIFTSHADER_DIR}/include"
 )

 target_compile_definitions(vk-unittests