mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Cmake build: Allow cross-compiling with mingw again
1.) The check for "QT_USES_X11" expects the created application to run, but the '.exe' file does not run on linux. 2.) Don't use megered build anymore, it is not faster on multi-processor machines anyway
This commit is contained in:
parent
4311571b9d
commit
454f56b5f2
@ -240,22 +240,29 @@ if(LYX_USE_QT MATCHES "QT5")
|
||||
else()
|
||||
set(lyx_qt5_config "QtCore/qconfig.h")
|
||||
endif()
|
||||
check_cxx_source_runs(
|
||||
"
|
||||
#include <${lyx_qt5_config}>
|
||||
#include <string>
|
||||
using namespace std;
|
||||
string a(QT_QPA_DEFAULT_PLATFORM_NAME);
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (a.compare(\"xcb\") == 0)
|
||||
return(0);
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
"
|
||||
QT_USES_X11)
|
||||
set(QPA_XCB ${QT_USES_X11})
|
||||
if(WIN32)
|
||||
set(QT_USES_X11 CACHE "Win32 compiled without X11" 0)
|
||||
# The try_run for minngw would not work here anyway
|
||||
else()
|
||||
check_cxx_source_runs(
|
||||
"
|
||||
#include <${lyx_qt5_config}>
|
||||
#include <string>
|
||||
using namespace std;
|
||||
string a(QT_QPA_DEFAULT_PLATFORM_NAME);
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (a.compare(\"xcb\") == 0)
|
||||
return(0);
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
"
|
||||
QT_USES_X11)
|
||||
if(QT_USES_X11)
|
||||
set(QPA_XCB ${QT_USES_X11})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (Qt5X11Extras_FOUND)
|
||||
get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS)
|
||||
|
@ -98,7 +98,7 @@ checkExitCode
|
||||
# build LyX
|
||||
#
|
||||
|
||||
mergefile=-DLYX_MERGE_FILES=1
|
||||
mergefile=-DLYX_MERGE_FILES=0
|
||||
#pch=-DLYX_PCH=1
|
||||
|
||||
cmake $lyxsrcdir \
|
||||
|
Loading…
Reference in New Issue
Block a user