Skip to content

Commit

Permalink
Qt: Fix Qt 5.10-induced bitrot
Browse files Browse the repository at this point in the history
  • Loading branch information
endrift committed Dec 11, 2017
1 parent 70528c9 commit 9086a00
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions src/platform/qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()

if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif()

set(PLATFORM_SRC)
set(QT_STATIC OFF)

Expand Down Expand Up @@ -41,6 +34,17 @@ if(NOT Qt5Widgets_FOUND)
return()
endif()

if(APPLE)
if(Qt5Widgets_VERSION MATCHES "^5.1[0-9]")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif()

if(BUILD_GL)
list(APPEND PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/opengl/gl.c)
if(NOT WIN32 OR USE_EPOXY)
Expand Down

0 comments on commit 9086a00

Please sign in to comment.