anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: Adapt to compile with qt5.11

Browse Source 
Since qt5_use_modules() is removed from QT5 (as spotted
by Jürgen Spitzmüller), we had to create own version
of this macro.
This commit is contained in:
Kornel Benko 2018-06-09 16:52:15 +02:00
parent 01d8f41894
commit d6b21e20e2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -657,8 +657,19 @@ if(LYX_USE_QT MATCHES "QT5")
# Subject: cmake compilation error # Subject: cmake compilation error
#message(FATAL_ERROR "Wrong Qt-Version") #message(FATAL_ERROR "Wrong Qt-Version")
endif() endif()
macro (qt_use_modules) macro (qt_use_modules lyxtarget)
qt5_use_modules(${ARGN}) if (Qt5_POSITION_INDEPENDENT_CODE
AND (CMAKE_VERSION VERSION_LESS 2.8.12
AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
set_property(TARGET ${lyxtarget} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
endif()
foreach (_tg ${ARGN})
find_package(Qt5${_tg} REQUIRED)
include_directories(${Qt5${_tg}_INCLUDE_DIRS})
set_property(TARGET ${lyxtarget} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_tg}_COMPILE_DEFINITIONS})
target_link_libraries(${lyxtarget} ${Qt5${_tg}_LIBRARIES})
endforeach()
endmacro() endmacro()
macro (qt_add_resources) macro (qt_add_resources)
qt5_add_resources(${ARGN}) qt5_add_resources(${ARGN})