Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'backport-3.16-automoc-path-prefix-off'

Browse Source
This commit is contained in:
Brad King
2020-08-10 10:41:06 -04:00
parent 56510b7d85 4c33b305a0
commit e503fbe38a
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Help/prop_tgt/AUTOMOC_PATH_PREFIX.rst
View File

@@ -13,7 +13,7 @@ the ``-p`` path prefix option. ``moc`` usually generates a
relative include path in that case. relative include path in that case.
:prop_tgt:`AUTOMOC_PATH_PREFIX` is initialized from the variable :prop_tgt:`AUTOMOC_PATH_PREFIX` is initialized from the variable
:variable:`CMAKE_AUTOMOC_PATH_PREFIX`, which is ``ON`` by default. :variable:`CMAKE_AUTOMOC_PATH_PREFIX`, which is ``OFF`` by default.
See the :manual:`cmake-qt(7)` manual for more information on using CMake See the :manual:`cmake-qt(7)` manual for more information on using CMake
with Qt. with Qt.
@@ -24,8 +24,7 @@ Reproducible builds
For reproducible builds it is recommended to keep headers that are ``moc`` For reproducible builds it is recommended to keep headers that are ``moc``
compiled in one of the target compiled in one of the target
:command:`include directories <target_include_directories>` and set :command:`include directories <target_include_directories>` and set
:prop_tgt:`AUTOMOC_PATH_PREFIX` to ``ON`` (which is the default). This ensures :prop_tgt:`AUTOMOC_PATH_PREFIX` to ``ON``. This ensures that:
that:
- ``moc`` output files are identical on different build setups, - ``moc`` output files are identical on different build setups,
- ``moc`` output files will compile correctly when the source and/or - ``moc`` output files will compile correctly when the source and/or

2
Help/variable/CMAKE_AUTOMOC_PATH_PREFIX.rst
View File

@@ -8,4 +8,4 @@ This variable is used to initialize the :prop_tgt:`AUTOMOC_PATH_PREFIX`
property on all the targets. See that target property for additional property on all the targets. See that target property for additional
information. information.
The default value is ``ON``. The default value is ``OFF``.

4
Modules/CMakeGenericSystem.cmake
View File

@@ -26,7 +26,9 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
set(CMAKE_AUTOGEN_ORIGIN_DEPENDS ON) set(CMAKE_AUTOGEN_ORIGIN_DEPENDS ON)
set(CMAKE_AUTOMOC_COMPILER_PREDEFINES ON) set(CMAKE_AUTOMOC_COMPILER_PREDEFINES ON)
set(CMAKE_AUTOMOC_PATH_PREFIX ON) if(NOT DEFINED CMAKE_AUTOMOC_PATH_PREFIX)
set(CMAKE_AUTOMOC_PATH_PREFIX OFF)
endif()
set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT") set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")
# basically all general purpose OSs support shared libs # basically all general purpose OSs support shared libs

1
Tests/QtAutogen/MocIncludeSymlink/CMakeLists.txt
View File

@@ -61,6 +61,7 @@ macro(buildMocInclude sourceDir binaryDir)
"${sourceDir}" "${sourceDir}"
MocInclude MocInclude
CMAKE_FLAGS "-DQT_TEST_VERSION=${QT_TEST_VERSION}" CMAKE_FLAGS "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
"-DCMAKE_AUTOMOC_PATH_PREFIX=ON"
"-DCMAKE_AUTOGEN_VERBOSE=${CMAKE_AUTOGEN_VERBOSE}" "-DCMAKE_AUTOGEN_VERBOSE=${CMAKE_AUTOGEN_VERBOSE}"
"-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}" "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
OUTPUT_VARIABLE output OUTPUT_VARIABLE output