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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: Ie52e046f8e280e8c39f0cc5e9e710b4f885010a6
This commit is contained in:
Eike Ziller
2020-12-17 13:10:44 +01:00
parent 6a2a07d516 1ae893de26
commit 5572bc7220
17 changed files with 147 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,26 @@
cmake_minimum_required(VERSION 3.10)
project(QLiteHtml)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/litehtml/CMakeLists.txt)
set(ORIG_FPIC ${CMAKE_POSITION_INDEPENDENT_CODE})
if (WIN32)
set(LITEHTML_UTF8 ON CACHE BOOL "")
endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# suppress warning about VERSION being overwritten or not
# and add subdirectory
set(ORIG_VERSION ${PROJECT_VERSION})
set(ORIG_MAJOR ${PROJECT_VERSION_MAJOR})
set(ORIG_MINOR ${PROJECT_VERSION_MINOR})
set(ORIG_PATCH ${PROJECT_VERSION_PATCH})
set(PROJECT_VERSION "")
set(PROJECT_VERSION_MAJOR "")
set(PROJECT_VERSION_MINOR "")
set(PROJECT_VERSION_PATCH "")
add_subdirectory(litehtml EXCLUDE_FROM_ALL)
set(PROJECT_VERSION ${ORIG_VERSION})
set(PROJECT_VERSION_MAJOR ${ORIG_MAJOR})
set(PROJECT_VERSION_MINOR ${ORIG_MINOR})
set(PROJECT_VERSION_PATCH ${ORIG_PATCH})
set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}")
# force optimized litehtml even in debug
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -22,13 +34,6 @@ else()
find_package(litehtml REQUIRED)
endif()
find_package(Qt5 COMPONENTS Widgets REQUIRED)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_STANDARD 17)
add_qtc_library(qlitehtml
PUBLIC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS Qt5::Widgets litehtml