Skip to content

Commit d9a9a14

Browse files
authored
Merge pull request #13 from a17r/qt-5.11
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2 parents 3849b5a + 91ba61f commit d9a9a14

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ ENDIF()
487487

488488
#If we have found Qt5, let's try to top off by getting the webkit as well
489489
IF ( Qt5Widgets_FOUND )
490+
FIND_PACKAGE(Qt5OpenGL REQUIRED)
490491
FIND_PACKAGE(Qt5WebKitWidgets QUIET)
491492

492493
IF(COMMAND cmake_policy)

src/osgQt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ ENDIF( QT4_FOUND )
8585
SETUP_LIBRARY(${LIB_NAME})
8686

8787
IF ( Qt5Widgets_FOUND )
88-
qt5_use_modules( ${LIB_NAME} Widgets OpenGL )
88+
TARGET_LINK_LIBRARIES( ${LIB_NAME} Qt5::Widgets Qt5::OpenGL )
8989
ENDIF ( Qt5Widgets_FOUND )

0 commit comments

Comments
 (0)