From c924cbf2a7fd3e8f74e4cfab4a1f0069ace69a66 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sat, 13 Jan 2018 12:19:07 -0800 Subject: [PATCH] Remove explicit gpu-gl dependencies --- android/app/CMakeLists.txt | 2 +- plugins/oculus/CMakeLists.txt | 3 ++- plugins/oculusLegacy/CMakeLists.txt | 2 +- plugins/openvr/CMakeLists.txt | 2 +- tests/gpu-test/CMakeLists.txt | 8 +++++++- tests/render-perf/CMakeLists.txt | 10 +++++++++- tests/render-texture-load/CMakeLists.txt | 10 +++++++++- tests/render-utils/CMakeLists.txt | 2 +- tests/shaders/CMakeLists.txt | 9 ++++++--- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt index a0af43b30a..4c50cd8609 100644 --- a/android/app/CMakeLists.txt +++ b/android/app/CMakeLists.txt @@ -1,6 +1,6 @@ set(TARGET_NAME native-lib) setup_hifi_library() -link_hifi_libraries(shared networking gl gpu gpu-gles image fbx render-utils physics entities octree) +link_hifi_libraries(shared networking gl gpu image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND}) target_opengl() target_bullet() diff --git a/plugins/oculus/CMakeLists.txt b/plugins/oculus/CMakeLists.txt index c77a1f30e6..59986d103e 100644 --- a/plugins/oculus/CMakeLists.txt +++ b/plugins/oculus/CMakeLists.txt @@ -19,9 +19,10 @@ if (WIN32 AND (NOT USE_GLES)) set(TARGET_NAME oculus) setup_hifi_plugin(Multimedia) link_hifi_libraries( - shared gl gpu gpu-gl controllers ui + shared gl gpu controllers ui plugins ui-plugins display-plugins input-plugins audio-client networking render-utils + ${PLATFORM_GL_BACKEND} ) include_hifi_library_headers(octree) diff --git a/plugins/oculusLegacy/CMakeLists.txt b/plugins/oculusLegacy/CMakeLists.txt index 12d0236cc2..00e90fb6d7 100644 --- a/plugins/oculusLegacy/CMakeLists.txt +++ b/plugins/oculusLegacy/CMakeLists.txt @@ -13,7 +13,7 @@ if (APPLE) set(TARGET_NAME oculusLegacy) setup_hifi_plugin() - link_hifi_libraries(shared gl gpu gpu-gl plugins ui ui-plugins display-plugins input-plugins midi) + link_hifi_libraries(shared gl gpu plugins ui ui-plugins display-plugins input-plugins midi ${PLATFORM_GL_BACKEND}) include_hifi_library_headers(octree) diff --git a/plugins/openvr/CMakeLists.txt b/plugins/openvr/CMakeLists.txt index 3d63a7ba9f..c561a9ce72 100644 --- a/plugins/openvr/CMakeLists.txt +++ b/plugins/openvr/CMakeLists.txt @@ -13,7 +13,7 @@ if (WIN32 AND (NOT USE_GLES)) setup_hifi_plugin(OpenGL Script Qml Widgets Multimedia) link_hifi_libraries(shared gl networking controllers ui plugins display-plugins ui-plugins input-plugins script-engine - audio-client render-utils model gpu gpu-gl render model-networking fbx ktx image procedural) + audio-client render-utils model gpu render model-networking fbx ktx image procedural ${PLATFORM_GL_BACKEND}) include_hifi_library_headers(octree) diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt index 8e49d523b8..f3ab991952 100644 --- a/tests/gpu-test/CMakeLists.txt +++ b/tests/gpu-test/CMakeLists.txt @@ -4,7 +4,13 @@ AUTOSCRIBE_SHADER_LIB(gpu model render-utils) setup_hifi_project(Quick Gui OpenGL Script Widgets) setup_memory_debugger() set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") -link_hifi_libraries(networking gl gpu gpu-gl procedural shared fbx model model-networking animation script-engine render render-utils octree image ktx) +link_hifi_libraries( + shared networking gl + ktx gpu procedural octree image + model model-networking fbx animation + script-engine render render-utils + ${PLATFORM_GL_BACKEND} +) if (WIN32) add_dependency_external_projects(wasapi) diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt index 09b2dc6a50..f84105e74f 100644 --- a/tests/render-perf/CMakeLists.txt +++ b/tests/render-perf/CMakeLists.txt @@ -12,7 +12,15 @@ setup_hifi_project(Quick Gui OpenGL) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") # link in the shared libraries -link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl render model-networking networking render-utils entities entities-renderer animation audio avatars script-engine physics procedural midi ui) +link_hifi_libraries( + shared networking animation + ktx image octree gl gpu + render render-utils + model fbx model-networking + entities entities-renderer audio avatars script-engine + physics procedural midi ui + ${PLATFORM_GL_BACKEND} +) if (WIN32) target_link_libraries(${TARGET_NAME} Winmm.lib) diff --git a/tests/render-texture-load/CMakeLists.txt b/tests/render-texture-load/CMakeLists.txt index 432a1f00d6..154155be25 100644 --- a/tests/render-texture-load/CMakeLists.txt +++ b/tests/render-texture-load/CMakeLists.txt @@ -12,7 +12,15 @@ setup_hifi_project(Quick Gui OpenGL) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") # link in the shared libraries -link_hifi_libraries(shared octree gl gpu gpu-gl render model model-networking networking render-utils fbx entities entities-renderer animation audio avatars script-engine physics ktx image) +link_hifi_libraries( + shared networking octree + gl gpu render ktx image animation + model fbx model-networking + render-utils + entities entities-renderer audio avatars + script-engine physics + ${PLATFORM_GL_BACKEND} +) package_libraries_for_deployment() diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt index 4e67aef3be..e3b1523a96 100644 --- a/tests/render-utils/CMakeLists.txt +++ b/tests/render-utils/CMakeLists.txt @@ -8,7 +8,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") setup_memory_debugger() # link in the shared libraries -link_hifi_libraries(render-utils gl gpu gpu-gl shared) +link_hifi_libraries(render-utils gl gpu shared ${PLATFORM_GL_BACKEND}) target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) if (WIN32) diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt index ba4ca88127..97af0af09f 100644 --- a/tests/shaders/CMakeLists.txt +++ b/tests/shaders/CMakeLists.txt @@ -8,9 +8,12 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/") setup_memory_debugger() # link in the shared libraries -link_hifi_libraries(shared octree gl gpu gpu-gl model render fbx networking entities - script-engine physics - render-utils entities-renderer) +link_hifi_libraries( + shared octree gl gpu model render fbx networking entities + script-engine physics + render-utils entities-renderer + ${PLATFORM_GL_BACKEND} +) include_directories("${PROJECT_BINARY_DIR}/../../libraries/gpu/") include_directories("${PROJECT_BINARY_DIR}/../../libraries/render-utils/")