We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Provide OpenGL for CMake tests

opengl-for-cmake-tests.patch (text/plain), 2.03 KB, created by vladius on 2021-02-10 15:46:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vladius

Created: 2021-02-10 15:46:39 UTC

Size: 2.03 KB

patch

obsolete

># HG changeset patch
># User Vladislav Dmitrievich Turbanov <vladislav@turbanov.ru>
># Date 1612971719 -10800
>#      Wed Feb 10 18:41:59 2021 +0300
># Branch SDL-2.0-vladius
># Node ID 53c10938d0d37266fd1e533328b347d7654b371a
># Parent  e48d6e3b60a079ab3e82d55b998a36cd5a1b0e1a
>* Modern OpenGL inclusion for tests within CMake pipeline.
>
>diff -r e48d6e3b60a0 -r 53c10938d0d3 test/CMakeLists.txt
>--- a/test/CMakeLists.txt	Wed Feb 10 16:01:35 2021 +0300
>+++ b/test/CMakeLists.txt	Wed Feb 10 18:41:59 2021 +0300
>@@ -1,4 +1,4 @@
>-cmake_minimum_required(VERSION 2.8.11)
>+cmake_minimum_required(VERSION 3.0.0)
> project(SDL2 C)
> 
> # Global settings for all of the test targets
>@@ -13,6 +13,12 @@
>     add_definitions(-Dmain=SDL_main)
> endif()
> 
>+find_package(OpenGL)
>+
>+if (OPENGL_FOUND)
>+add_definitions(-DHAVE_OPENGL)
>+endif()
>+
> add_executable(checkkeys checkkeys.c)
> add_executable(loopwave loopwave.c)
> add_executable(loopwavequeue loopwavequeue.c)
>@@ -88,13 +94,20 @@
> add_executable(testvulkan testvulkan.c)
> add_executable(testoffscreen testoffscreen.c)
> 
>+if(OPENGL_FOUND)
>+add_dependencies(testshader OpenGL::GL)
>+add_dependencies(testgl2 OpenGL::GL)
>+target_link_libraries(testshader OpenGL::GL)
>+target_link_libraries(testgl2 OpenGL::GL)
>+endif()
>+
> # HACK: Dummy target to cause the resource files to be copied to the build directory.
> # Need to make it an executable so we can use the TARGET_FILE_DIR generator expression.
> # This is needed so they get copied to the correct Debug/Release subdirectory in Xcode.
> file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/resources_dummy.c "int main(int argc, const char **argv){ return 1; }\n")
> add_executable(SDL2_test_resoureces ${CMAKE_CURRENT_BINARY_DIR}/resources_dummy.c)
> 
>-file(GLOB RESOURCE_FILES *.bmp *.wav moose.dat utf8.txt)
>+file(GLOB RESOURCE_FILES *.bmp *.hex *.wav moose.dat utf8.txt)
> foreach(RESOURCE_FILE ${RESOURCE_FILES})
>     add_custom_command(TARGET SDL2_test_resoureces POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${RESOURCE_FILE} $<TARGET_FILE_DIR:SDL2_test_resoureces>)
> endforeach(RESOURCE_FILE)

Actions: View

Attachments on bug 5545: 4792 | 4793

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.