anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: Shuffle code around.

Browse Source
This commit is contained in:
Kornel Benko 2016-09-12 11:04:14 +02:00
parent a24033ff0e
commit e78e58a7de
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -651,8 +651,9 @@ elseif(LYX_USE_QT MATCHES "QT4")
macro (qt_wrap_uifiles) macro (qt_wrap_uifiles)
qt4_wrap_ui(${ARGN}) qt4_wrap_ui(${ARGN})
endmacro() endmacro()
set(LYX_QTMAIN_LIBRARY ${QT_QTSVG_LIBRARY})
if(WIN32) if(WIN32)
set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES}) list(APPEND LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
endif() endif()
else() else()
message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})") message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})")

3
src/CMakeLists.txt
View File

@ -132,9 +132,6 @@ target_link_libraries(${_lyx}
${LYX_QTMAIN_LIBRARY} ${LYX_QTMAIN_LIBRARY}
${vld_dll}) ${vld_dll})
if(LYX_USE_QT MATCHES "QT4")
target_link_libraries(${_lyx} ${QT_QTSVG_LIBRARY})
endif()
qt_use_modules(${_lyx} Core Gui) qt_use_modules(${_lyx} Core Gui)
if(QT_USES_X11) if(QT_USES_X11)