diff options
| -rw-r--r-- | Help/dev/review.rst | 7 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/QtAutogen/mocPlugin/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Utilities/IWYU/mapping.imp | 1 |
5 files changed, 13 insertions, 6 deletions
diff --git a/Help/dev/review.rst b/Help/dev/review.rst index c4122d4..9450bf0 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -216,7 +216,12 @@ Builder names follow the pattern ``project-host-os-buildtype-generator``: * ``host``: the buildbot host * ``os``: one of ``windows``, ``osx``, or ``linux`` * ``buildtype``: ``release`` or ``debug`` -* ``generator``: ``ninja``, ``makefiles``, or ``vs<year>`` +* ``generator``: ``ninja``, ``makefiles``, ``vs<year>``, + or ``lint-iwyu-tidy`` + +The special ``lint-<tools>`` generator name is a builder that builds +CMake using lint tools but does not run the test suite (so the actual +generator does not matter). .. _`buildbot`: http://buildbot.net .. _`CMake CDash Page`: https://open.cdash.org/index.php?project=CMake diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ea98a62..918e6b0 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 8) -set(CMake_VERSION_PATCH 20170530) +set(CMake_VERSION_PATCH 20170531) #set(CMake_VERSION_RC 1) diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 101b396..073c5fd 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -304,10 +304,10 @@ if (NOT QT_TEST_VERSION STREQUAL 4) set(timeformat "%Y%j%H%M%S") set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin") set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin") - find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) file(TIMESTAMP "${plAFile}" plABefore "${timeformat}") file(TIMESTAMP "${plBFile}" plBBefore "${timeformat}") diff --git a/Tests/QtAutogen/mocPlugin/CMakeLists.txt b/Tests/QtAutogen/mocPlugin/CMakeLists.txt index 4843c21..f80aa29 100644 --- a/Tests/QtAutogen/mocPlugin/CMakeLists.txt +++ b/Tests/QtAutogen/mocPlugin/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.8) +project(mocPlugin CXX) set(CMAKE_AUTOMOC_DEPEND_FILTERS "A_CUSTOM_MACRO" diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index 3604c0d..fe0f7df 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -21,6 +21,7 @@ { include: [ "<wctype.h>", public, "<cwctype>", public ] }, # HACK: check whether this can be removed with next iwyu release. + { include: [ "<bits/std_function.h>", private, "<functional>", public ] }, { include: [ "<bits/time.h>", private, "<time.h>", public ] }, { include: [ "<bits/types/clock_t.h>", private, "<time.h>", public ] }, { include: [ "<bits/types/struct_timespec.h>", private, "<time.h>", public ] }, |