commit 24b5d1a9e68d3b5a1d5f5e72bac5e373fdb308bf
author Antonio Maiorano <amaiorano@google.com> Mon Apr 06 12:22:44 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Wed Apr 08 13:29:16 2020 +0000
tree cbc09b6b0536093dfcfdb1840ad2f616c867c0c2
parent dacbf0d0f790a7de74d4d22191b129c539427899

CMake: clean up dependencies

This change makes it so that source/Common and source/Main are only
referenced by the SwiftShader target. This will allow for better
target-based sub CMakeLists.

* Remove SharedLibrary.hpp/cpp from source list of libGLESv2 and
  libGLES_CM, as both of these depend on SwiftShader, which already
  builds these files.

* Make libEGL depend on SwiftShader, so we can remove
  SharedLibrary.hpp/cpp and Main/libX11.hpp/cpp from its
  source list.

Bug: b/145758253
Change-Id: If3d8e12cd09fb40d699080c2eeaa8243abe50512
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43528
Tested-by: Antonio Maiorano <amaiorano@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dba0006..3f27475 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -681,8 +681,6 @@
     ${OPENGL_DIR}/common/Object.hpp
     ${OPENGL_DIR}/common/debug.cpp
     ${OPENGL_DIR}/common/debug.h
-    ${SOURCE_DIR}/Common/SharedLibrary.cpp
-    ${SOURCE_DIR}/Common/SharedLibrary.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
 )
 
@@ -693,8 +691,6 @@
     ${OPENGL_DIR}/common/*.cpp
     ${OPENGL_DIR}/common/*.h
     ${OPENGL_DIR}/common/*.hpp
-    ${SOURCE_DIR}/Common/SharedLibrary.cpp
-    ${SOURCE_DIR}/Common/SharedLibrary.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h
@@ -707,8 +703,6 @@
     ${OPENGL_DIR}/common/*.cpp
     ${OPENGL_DIR}/common/*.h
     ${OPENGL_DIR}/common/*.hpp
-    ${SOURCE_DIR}/Common/SharedLibrary.cpp
-    ${SOURCE_DIR}/Common/SharedLibrary.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h
 )
@@ -772,7 +766,8 @@
 if(LINUX OR ANDROID)
     list(APPEND VULKAN_LIST
         ${SOURCE_DIR}/System/Linux/MemFd.cpp
-	${SOURCE_DIR}/System/Linux/MemFd.hpp)
+        ${SOURCE_DIR}/System/Linux/MemFd.hpp
+    )
 endif()
 
 ###########################################################
@@ -801,12 +796,6 @@
     list(APPEND SWIFTSHADER_LIST
         ${SOURCE_DIR}/Main/FrameBufferX11.cpp
         ${SOURCE_DIR}/Main/FrameBufferX11.hpp
-        ${SOURCE_DIR}/Common/SharedLibrary.hpp
-        ${SOURCE_DIR}/Main/libX11.cpp
-        ${SOURCE_DIR}/Main/libX11.hpp
-    )
-    list(APPEND EGL_LIST
-        ${SOURCE_DIR}/Common/SharedLibrary.hpp
         ${SOURCE_DIR}/Main/libX11.cpp
         ${SOURCE_DIR}/Main/libX11.hpp
     )
@@ -930,7 +919,7 @@
         set_target_properties(libEGL PROPERTIES SUFFIX "_swiftshader.so")
     endif ()
     set_shared_library_export_map(libEGL ${SOURCE_DIR}/OpenGL/libEGL)
-    target_link_libraries(libEGL ${OS_LIBS} ${SWIFTSHADER_LIBS})
+    target_link_libraries(libEGL SwiftShader ${OS_LIBS} ${SWIFTSHADER_LIBS})
     add_custom_command(
         TARGET libEGL
         POST_BUILD
@@ -1170,13 +1159,15 @@
 
     # System unit tests
     set(SYSTEM_UNITTESTS_LIST
-        ${SOURCE_DIR}/System/Debug.cpp
-        ${SOURCE_DIR}/System/Memory.cpp
-
         ${TESTS_DIR}/SystemUnitTests/main.cpp
         ${TESTS_DIR}/SystemUnitTests/unittests.cpp
     )
 
+    # TODO: Replace with dep on System static target
+    list(APPEND SYSTEM_UNITTESTS_LIST
+        ${SOURCE_DIR}/System/Debug.cpp
+        ${SOURCE_DIR}/System/Memory.cpp
+    )
     if(LINUX OR ANDROID)
         list(APPEND SYSTEM_UNITTESTS_LIST
             ${SOURCE_DIR}/System/Linux/MemFd.cpp