Skip to content

S
swiftshader
Commit 24b5d1a9 by Antonio Maiorano
Options

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/+/43528Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent dacbf0d0
Showing with 8 additions and 17 deletions
CMakeLists.txt
...@@ -681,8 +681,6 @@ file(GLOB_RECURSE EGL_LIST ...@@ -681,8 +681,6 @@ file(GLOB_RECURSE EGL_LIST
${OPENGL_DIR}/common/Object.hpp ${OPENGL_DIR}/common/Object.hpp
${OPENGL_DIR}/common/debug.cpp ${OPENGL_DIR}/common/debug.cpp
${OPENGL_DIR}/common/debug.h ${OPENGL_DIR}/common/debug.h
${SOURCE_DIR}/Common/SharedLibrary.cpp
${SOURCE_DIR}/Common/SharedLibrary.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
) )
...@@ -693,8 +691,6 @@ file(GLOB_RECURSE GLES2_LIST ...@@ -693,8 +691,6 @@ file(GLOB_RECURSE GLES2_LIST
${OPENGL_DIR}/common/*.cpp ${OPENGL_DIR}/common/*.cpp
${OPENGL_DIR}/common/*.h ${OPENGL_DIR}/common/*.h
${OPENGL_DIR}/common/*.hpp ${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/KHR/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h
...@@ -707,8 +703,6 @@ file(GLOB_RECURSE GLES_CM_LIST ...@@ -707,8 +703,6 @@ file(GLOB_RECURSE GLES_CM_LIST
${OPENGL_DIR}/common/*.cpp ${OPENGL_DIR}/common/*.cpp
${OPENGL_DIR}/common/*.h ${OPENGL_DIR}/common/*.h
${OPENGL_DIR}/common/*.hpp ${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/KHR/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h
) )
...@@ -772,7 +766,8 @@ endif() ...@@ -772,7 +766,8 @@ endif()
if(LINUX OR ANDROID) if(LINUX OR ANDROID)
list(APPEND VULKAN_LIST list(APPEND VULKAN_LIST
${SOURCE_DIR}/System/Linux/MemFd.cpp ${SOURCE_DIR}/System/Linux/MemFd.cpp
${SOURCE_DIR}/System/Linux/MemFd.hpp) ${SOURCE_DIR}/System/Linux/MemFd.hpp
)
endif() endif()
########################################################### ###########################################################
...@@ -801,12 +796,6 @@ elseif(LINUX) ...@@ -801,12 +796,6 @@ elseif(LINUX)
list(APPEND SWIFTSHADER_LIST list(APPEND SWIFTSHADER_LIST
${SOURCE_DIR}/Main/FrameBufferX11.cpp ${SOURCE_DIR}/Main/FrameBufferX11.cpp
${SOURCE_DIR}/Main/FrameBufferX11.hpp ${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.cpp
${SOURCE_DIR}/Main/libX11.hpp ${SOURCE_DIR}/Main/libX11.hpp
) )
...@@ -930,7 +919,7 @@ if(SWIFTSHADER_BUILD_EGL) ...@@ -930,7 +919,7 @@ if(SWIFTSHADER_BUILD_EGL)
set_target_properties(libEGL PROPERTIES SUFFIX "_swiftshader.so") set_target_properties(libEGL PROPERTIES SUFFIX "_swiftshader.so")
endif () endif ()
set_shared_library_export_map(libEGL ${SOURCE_DIR}/OpenGL/libEGL) 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( add_custom_command(
TARGET libEGL TARGET libEGL
POST_BUILD POST_BUILD
...@@ -1170,13 +1159,15 @@ if(SWIFTSHADER_BUILD_TESTS) ...@@ -1170,13 +1159,15 @@ if(SWIFTSHADER_BUILD_TESTS)
# System unit tests # System unit tests
set(SYSTEM_UNITTESTS_LIST set(SYSTEM_UNITTESTS_LIST
${SOURCE_DIR}/System/Debug.cpp
${SOURCE_DIR}/System/Memory.cpp
${TESTS_DIR}/SystemUnitTests/main.cpp ${TESTS_DIR}/SystemUnitTests/main.cpp
${TESTS_DIR}/SystemUnitTests/unittests.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) if(LINUX OR ANDROID)
list(APPEND SYSTEM_UNITTESTS_LIST list(APPEND SYSTEM_UNITTESTS_LIST
${SOURCE_DIR}/System/Linux/MemFd.cpp ${SOURCE_DIR}/System/Linux/MemFd.cpp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment