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

cmake build: Make it easier to build against system litehtml

Browse Source 
By first checking for it in the system, then if the internal copy
is checked out.

Fixes: QTCREATORBUG-25144
Change-Id: I839591cc8e311948a21685384de574e7330a6ee5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-01-06 13:18:41 +01:00
parent bb070d861b
commit b82d51ad69
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/CMakeLists.txt
View File

@@ -60,14 +60,8 @@ extend_qtc_plugin(Help
webenginehelpviewer.h
)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/litehtml/CMakeLists.txt)
add_subdirectory(qlitehtml)
else()
find_package(litehtml QUIET)
if (TARGET litehtml)
add_subdirectory(qlitehtml)
endif()
endif()
find_package(litehtml QUIET)
add_subdirectory(qlitehtml)
extend_qtc_plugin(Help
CONDITION TARGET litehtml AND TARGET qlitehtml

6
src/plugins/help/qlitehtml/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/litehtml/CMakeLists.txt)
find_package(litehtml QUIET)
if(NOT TARGET litehtml AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/litehtml/CMakeLists.txt)
set(ORIG_FPIC ${CMAKE_POSITION_INDEPENDENT_CODE})
if (WIN32)
set(LITEHTML_UTF8 ON CACHE BOOL "")
@@ -16,11 +17,10 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/litehtml/CMakeLists.txt)
target_compile_options(litehtml PRIVATE -O2)
endif()
endif()
else()
find_package(litehtml REQUIRED)
endif()
add_qtc_library(qlitehtml
CONDITION TARGET litehtml
PUBLIC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS Qt5::Widgets litehtml
PROPERTIES