From f239fa86764d9a1721ff043c5bb42ac007e9909c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 15 Dec 2020 11:37:17 +0100 Subject: [PATCH] Fix build-time location of QLiteHtml QtCreatorAPI sets the output location relative to the project which makes sense for external projects, but not so much for internal sub-projects. In this specific case it cannot be built as a standalone project at all anymore, since we use add_qtc_library but don't force inclusion of QtCreatorAPI, so just remove the project() and related setup. When QLiteHtml is moved to an actual separate project and repository this must be reworked anyhow. Change-Id: I182de09619c2073aa3e1c9809c2251fd88b6bbd7 Reviewed-by: David Schulz Reviewed-by: Cristian Adam --- src/plugins/help/qlitehtml/CMakeLists.txt | 27 ++++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/plugins/help/qlitehtml/CMakeLists.txt b/src/plugins/help/qlitehtml/CMakeLists.txt index 19a003db04b..5c7957a88c5 100644 --- a/src/plugins/help/qlitehtml/CMakeLists.txt +++ b/src/plugins/help/qlitehtml/CMakeLists.txt @@ -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