From d24b867e56e7e4519185f37c12f02bcebd1c31f2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 2 Oct 2012 12:04:00 +0200 Subject: CMake: Improve QT5_GET_MOC_FLAGS macro We need to handle CMAKE_INCLUDE_CURRENT_DIR for include directories. Otherwise generated files located in the current binary directory are not found as expected. e.g. *.json file as meta data for Qt5's plugins generated at build time. Change-Id: I14ae1e7013f9d8b485aa990d50db4a03ca4f4b81 Reviewed-by: Yuchen Deng Reviewed-by: Stephen Kelly --- src/corelib/Qt5CoreMacros.cmake | 4 ++ tests/auto/cmake/CMakeLists.txt | 1 + .../cmake/test_json_plugin_includes/CMakeLists.txt | 21 +++++++++ .../cmake/test_json_plugin_includes/plugin.cpp | 50 ++++++++++++++++++++ .../auto/cmake/test_json_plugin_includes/plugin.h | 55 ++++++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt create mode 100644 tests/auto/cmake/test_json_plugin_includes/plugin.cpp create mode 100644 tests/auto/cmake/test_json_plugin_includes/plugin.h diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index b0d9135010..089445a184 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -69,6 +69,10 @@ macro(QT5_GET_MOC_FLAGS _moc_flags) set(${_moc_flags}) get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES) + if(CMAKE_INCLUDE_CURRENT_DIR) + list(APPEND _inc_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + endif() + foreach(_current ${_inc_DIRS}) if("${_current}" MATCHES "\\.framework/?$") string(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}") diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 1fe6ed14c4..9571502552 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -78,6 +78,7 @@ endif() expect_pass(test_private_includes) expect_pass(test_modules) expect_pass(test_testlib_definitions) +expect_pass(test_json_plugin_includes) expect_fail(test_testlib_no_link_gui) expect_fail(test_testlib_no_link_widgets) diff --git a/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt b/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt new file mode 100644 index 0000000000..7418fd68b3 --- /dev/null +++ b/tests/auto/cmake/test_json_plugin_includes/CMakeLists.txt @@ -0,0 +1,21 @@ + +cmake_minimum_required(VERSION 2.8) + +project(test_json_plugin_includes) + +find_package(Qt5Core REQUIRED) + +include_directories(${Qt5Core_INCLUDE_DIRS}) + +add_definitions(${Qt5Core_DEFINITIONS}) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/jsontestplugin.json" "{}\n") + +qt5_wrap_cpp(moc_files plugin.h) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") + +add_library(plugin plugin.cpp ${moc_files}) +target_link_libraries(plugin ${Qt5Core_LIBRARIES}) diff --git a/tests/auto/cmake/test_json_plugin_includes/plugin.cpp b/tests/auto/cmake/test_json_plugin_includes/plugin.cpp new file mode 100644 index 0000000000..cf9b9bf851 --- /dev/null +++ b/tests/auto/cmake/test_json_plugin_includes/plugin.cpp @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "plugin.h" + +JsonTestPlugin::JsonTestPlugin(QObject *parent) + : QObject(parent) +{ + +} + +#include "moc_plugin.cpp" diff --git a/tests/auto/cmake/test_json_plugin_includes/plugin.h b/tests/auto/cmake/test_json_plugin_includes/plugin.h new file mode 100644 index 0000000000..06db2e767f --- /dev/null +++ b/tests/auto/cmake/test_json_plugin_includes/plugin.h @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef JSON_TEST_PLUGIN_H +#define JSON_TEST_PLUGIN_H + +#include + +class JsonTestPlugin : public QObject +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "JsonTestPlugin" FILE "jsontestplugin.json") +public: + JsonTestPlugin(QObject *parent = 0); +}; + +#endif -- cgit v1.2.3