From b4928395d79a58119150673e4a4c60596d3326f1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 24 Sep 2019 10:44:12 +0200 Subject: [PATCH] Help/litehtml: Fix submodule build on Windows with CMake In debug mode. Mixing debug and release is not supported in all configurations, so just enable code optimization flags in debug. Change-Id: Iafa8c49825e02c35a9998bf84832710964ae7601 Reviewed-by: Cristian Adam Reviewed-by: Eike Ziller --- src/plugins/help/qlitehtml/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/help/qlitehtml/CMakeLists.txt b/src/plugins/help/qlitehtml/CMakeLists.txt index c9bcd3326dc..b841a6bc7a9 100644 --- a/src/plugins/help/qlitehtml/CMakeLists.txt +++ b/src/plugins/help/qlitehtml/CMakeLists.txt @@ -4,19 +4,17 @@ project(QLiteHtml) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/litehtml/CMakeLists.txt) set(ORIG_FPIC ${CMAKE_POSITION_INDEPENDENT_CODE}) - set(ORIG_CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}) - if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - set(CMAKE_BUILD_TYPE "RelWithDebInfo") - else() - set(CMAKE_BUILD_TYPE "Release") - endif() if (WIN32) set(LITEHTML_UTF8 ON) endif() set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_subdirectory(litehtml) - set(CMAKE_BUILD_TYPE ${ORIG_CMAKE_BUILD_TYPE}) set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}") + # force optimized litehtml even in debug + if (CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(gumbo PRIVATE -O2) + target_compile_options(litehtml PRIVATE -O2) + endif() else() find_package(litehtml REQUIRED) endif()