feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: And fix build for non-Windows again

Browse Source 
Change-Id: I13525d28361925aa4f5ec7cb2e4b3f3e45faf9c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2019-09-23 09:37:05 +02:00
committed by Christian Stenger
parent 2abf82434e
commit 9f8f0b3f5c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/help/qlitehtml/qlitehtml.pri
View File

@@ -11,15 +11,14 @@ exists($$PWD/litehtml/CMakeLists.txt) {
system("$$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${LITEHTML_BUILD_PATH}))")
macos: CMAKE_DEPLOYMENT_TARGET = -DCMAKE_OSX_DEPLOYMENT_TARGET=$${QMAKE_MACOSX_DEPLOYMENT_TARGET}
win32: LITEHTML_UTF8 = -DLITEHTML_UTF8=ON
win32: WINDOWS_OPTIONS = -DLITEHTML_UTF8=ON -G $$system_quote('NMake Makefiles')
LITEHTML_CMAKE_CMD = \
"$$QMAKE_CD $$system_quote($$shell_path($${LITEHTML_BUILD_PATH})) && \
cmake -DCMAKE_BUILD_TYPE=$$BUILD_TYPE \
-DCMAKE_INSTALL_PREFIX=$$system_quote($$shell_path($${LITEHTML_INSTALL_PATH})) \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
$$LITEHTML_UTF8 \
$$WINDOWS_OPTIONS \
$$CMAKE_DEPLOYMENT_TARGET \
-G $$system_quote('NMake Makefiles') \
$$system_quote($$shell_path($${LITEHTML_SOURCE_PATH}))"
message("$${LITEHTML_CMAKE_CMD}")
system("$${LITEHTML_CMAKE_CMD}")