From d0417eeac9a06cc2a7bdfb75f3bd414911563705 Mon Sep 17 00:00:00 2001 From: mgrojo Date: Sat, 1 Dec 2018 18:12:53 +0100 Subject: [PATCH] Support for CMake 3.11 CMake 3.11 has a new AUTOMOC implementation that is breaking QScintilla compilation. https://cmake.org/cmake/help/v3.11/release/3.11.html#autogen It is disabled and QT5_WRAP_CPP used instead. This has been tested with CMake 3.10.2 and 3.13.1. See issue #1361 --- libs/qscintilla/Qt4Qt5/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/qscintilla/Qt4Qt5/CMakeLists.txt b/libs/qscintilla/Qt4Qt5/CMakeLists.txt index b50bcfb9..6929dd8f 100644 --- a/libs/qscintilla/Qt4Qt5/CMakeLists.txt +++ b/libs/qscintilla/Qt4Qt5/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.8.12.2) -set(CMAKE_AUTOMOC ON) +# Disable AUTOMOC because it cannot be made to work with QScintilla +set(CMAKE_AUTOMOC OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) find_package(Qt5 REQUIRED COMPONENTS PrintSupport Widgets) @@ -165,9 +166,11 @@ set(QSCINTILLA_MOC_HDR SciAccessibility.h ) +QT5_WRAP_CPP(QSCINTILLA_WRAP_MOC_HDR ${QSCINTILLA_MOC_HDR}) + include_directories(. ../include ../lexlib ../src) -add_library(qscintilla2 ${QSCINTILLA_SRC} ${QSCINTILLA_HDR} ${QSCINTILLA_MOC_HDR} ${QSCINTILLA_MOC}) +add_library(qscintilla2 ${QSCINTILLA_SRC} ${QSCINTILLA_HDR} ${QSCINTILLA_MOC_HDR} ${QSCINTILLA_MOC} ${QSCINTILLA_WRAP_MOC_HDR}) target_link_libraries(qscintilla2 Qt5::Widgets Qt5::PrintSupport)