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

Also cross compile with Qt5

Browse Source 
Assume Ubuntu pathes for mingw.
This commit is contained in:
Peter Kümmel 2015-10-23 15:36:39 +02:00
parent a3b5ff264d
commit c39869cc61
2 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -542,9 +542,9 @@ if(LYX_CXX_FLAGS_EXTRA)
endif()
if(LYX_XMINGW)
set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
endif()
if(LYX_USE_QT MATCHES "QT5")
find_package(Qt5Core REQUIRED)
if (Qt5Core_FOUND)
@ -567,6 +567,10 @@ if(LYX_USE_QT MATCHES "QT5")
message(STATUS "Found Qt-Version ${QTVERSION}")
endif()
elseif(LYX_USE_QT MATCHES "QT4")
if(LYX_XMINGW)
set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
endif()
find_package(Qt4 "4.5.0" REQUIRED)
macro (qt_use_modules)
endmacro()

48
development/cmake/LyxPackaging.cmake
View File

@ -43,8 +43,14 @@ elseif(WIN32)
if(MINGW)
get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
if(LYX_XMINGW)
if(LYX_USE_QT MATCHES "QT4")
get_filename_component(mingw_name ${LYX_XMINGW} NAME)
set(MINGW_BIN_PATH ${MINGW_BIN_PATH}/../${mingw_name}/lib)
set(MINGW_LIB_PATH ${MINGW_BIN_PATH})
else()
set(MINGW_BIN_PATH /usr/lib/gcc/${LYX_XMINGW}/${GCC_VERSION})
set(MINGW_LIB_PATH /usr/${LYX_XMINGW}/lib)
endif()
endif()
if(EXISTS ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
@ -56,13 +62,50 @@ elseif(WIN32)
if(EXISTS ${MINGW_BIN_PATH}/libstdc++-6.dll)
list(APPEND runtime ${MINGW_BIN_PATH}/libstdc++-6.dll)
endif()
if(EXISTS ${MINGW_BIN_PATH}/libwinpthread-1.dll)
list(APPEND runtime ${MINGW_BIN_PATH}/libwinpthread-1.dll)
if(EXISTS ${MINGW_LIB_PATH}/libwinpthread-1.dll)
list(APPEND runtime ${MINGW_LIB_PATH}/libwinpthread-1.dll)
endif()
if(NOT runtime)
message(FATAL_ERROR "No mingw runtime found in ${MINGW_BIN_PATH}")
endif()
if(LYX_USE_QT MATCHES "QT5")
get_target_property(qmakebin Qt5::qmake IMPORTED_LOCATION)
get_filename_component(QT_BINARY_DIR ${qmakebin} PATH)
install(FILES
${runtime}
${QT_BINARY_DIR}/Qt5Core.dll
${QT_BINARY_DIR}/Qt5Network.dll
${QT_BINARY_DIR}/Qt5Gui.dll
${QT_BINARY_DIR}/Qt5Widgets.dll
${QT_BINARY_DIR}/Qt5Concurrent.dll
${QT_BINARY_DIR}/Qt5OpenGL.dll
${QT_BINARY_DIR}/Qt5PrintSupport.dll
${QT_BINARY_DIR}/Qt5Svg.dll
${QT_BINARY_DIR}/Qt5WinExtras.dll
DESTINATION bin
CONFIGURATIONS Release)
install(FILES
${QT_BINARY_DIR}/../plugins/platforms/qminimal.dll
${QT_BINARY_DIR}/../plugins/platforms/qwindows.dll
DESTINATION bin/platforms
CONFIGURATIONS Release)
install(FILES
${QT_BINARY_DIR}/../plugins/printsupport/windowsprintersupport.dll
DESTINATION bin/printsupport
CONFIGURATIONS Release)
install(FILES
${QT_BINARY_DIR}/../plugins/imageformats/qgif.dll
${QT_BINARY_DIR}/../plugins/imageformats/qjpeg.dll
${QT_BINARY_DIR}/../plugins/imageformats/qsvg.dll
${QT_BINARY_DIR}/../plugins/imageformats/qico.dll
DESTINATION bin/imageformats
CONFIGURATIONS Release)
install(FILES
${QT_BINARY_DIR}/../plugins/iconengines/qsvgicon.dll
DESTINATION bin/iconengines
CONFIGURATIONS Release)
else()
install(FILES
${runtime}
${QT_BINARY_DIR}/QtCore4.dll
@ -76,6 +119,7 @@ elseif(WIN32)
${QT_PLUGINS_DIR}/imageformats/qtiff4.dll
DESTINATION bin CONFIGURATIONS Release)
endif()
endif()
else()
# needed by rpm
set(CPACK_SET_DESTDIR "ON")