Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)

0.6.3
Andreas Sturmlechner 6 years ago
parent fc72483ddf
commit 2c9d46a60b
No known key found for this signature in database
GPG Key ID: E7255695D8BA079E

@ -106,7 +106,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY})
endif(WIN32)
else()
qt5_use_modules(openmw-launcher Widgets Core)
target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
endif()
if (BUILD_WITH_CODE_COVERAGE)

@ -246,7 +246,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
endif()
else()
qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
endif()
if (WIN32)

@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
endif()
else()
qt5_use_modules(openmw-wizard Widgets Core)
target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
endif()
if (OPENMW_USE_UNSHIELD)

@ -216,7 +216,7 @@ if (USE_QT)
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY})
else()
qt5_use_modules(components Widgets Core)
target_link_libraries(components Qt5::Widgets Qt5::Core)
endif()
endif()

@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
include(${QT_USE_FILE})
target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
else()
qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL)
endif()
link_directories(${CMAKE_CURRENT_BINARY_DIR})

Loading…
Cancel
Save