Merge branch 'master' into compatibility

14 years ago · 3ab7009188
3 changed files with 2 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -19,7 +19,7 @@ cmake_dependent_option(WITH_EGLCONTEXT "Build EglContext library" OFF "TARGET_GL
 cmake_dependent_option(WITH_GLUTCONTEXT "Build GlutContext library" OFF "NOT TARGET_GLES" OFF)
 option(WITH_SDL2CONTEXT "Build Sdl2Context library" OFF)

-option(BUILD_TESTS "Build unit tests (requires Qt4)." OFF)
+option(BUILD_TESTS "Build unit tests." OFF)

 if(WITH_EVERYTHING)
    set(WITH_MESHTOOLS ON)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -143,7 +143,6 @@ endif()

 if(BUILD_TESTS)
    enable_testing()
-    include_directories(${QT_INCLUDE_DIR})

    # Library with graceful assert for testing
    if(NOT CMAKE_NO_OBJECT_TARGET)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8964697e3278a1deaa9497999e542caeb7fee59f
+Subproject commit d075b128dc209f5b172d9969ca36dc532cc31c2e