teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1682 from a17r/qt-5.11

Browse source 
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
This commit is contained in:
Bret Curtis 2018-04-18 11:00:23 +02:00 committed by GitHub
commit 1427648d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/launcher/CMakeLists.txt
View file

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

2
apps/opencs/CMakeLists.txt
View file

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

2
apps/wizard/CMakeLists.txt
View file

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

2
components/CMakeLists.txt
View file

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

2
extern/osgQt/CMakeLists.txt vendored
View file

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