diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 12:14:23 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-06 14:59:26 (GMT) |
| commit | 48180401d321e7fba19ac45e9e2e8a718c20d0b8 (patch) | |
| tree | cce3e2aa0323317b7503a27e10ad35f986f5acc1 | |
| parent | 4fa858ecb1b40e63c733047f07cc5049f7e2366a (diff) | |
| download | CMake-48180401d321e7fba19ac45e9e2e8a718c20d0b8.zip CMake-48180401d321e7fba19ac45e9e2e8a718c20d0b8.tar.gz CMake-48180401d321e7fba19ac45e9e2e8a718c20d0b8.tar.bz2 | |
QtAutogen: Rename config AM_RELAXED_MODE to AM_MOC_RELAXED_MODE
| -rw-r--r-- | Modules/AutogenInfo.cmake.in | 2 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 4 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in index 7d89420..355d6d8 100644 --- a/Modules/AutogenInfo.cmake.in +++ b/Modules/AutogenInfo.cmake.in @@ -7,6 +7,7 @@ set(AM_HEADERS @_moc_headers@ ) set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@) set(AM_MOC_INCLUDES @_moc_incs@) set(AM_MOC_OPTIONS @_moc_options@) +set(AM_MOC_RELAXED_MODE "@_moc_relaxed_mode@") set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE "@CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@") set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/") set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/") @@ -18,7 +19,6 @@ set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(AM_QT_VERSION_MAJOR "@_target_qt_version@") set(AM_TARGET_NAME @_moc_target_name@) set(AM_ORIGIN_TARGET_NAME @_origin_target_name@) -set(AM_RELAXED_MODE "@_moc_relaxed_mode@") set(AM_UIC_TARGET_OPTIONS @_uic_target_options@) set(AM_UIC_OPTIONS_FILES @_qt_uic_options_files@) set(AM_UIC_OPTIONS_OPTIONS @_qt_uic_options_options@) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index fa33cf2..c0a9b63 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -320,7 +320,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( } this->CurrentCompileSettingsStr = this->MakeCompileSettingsString(makefile); - this->RelaxedMode = makefile->IsOn("AM_RELAXED_MODE"); + this->MocRelaxedMode = makefile->IsOn("AM_MOC_RELAXED_MODE"); return true; } @@ -497,7 +497,7 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) err << "AUTOGEN: Checking " << absFilename << std::endl; this->LogInfo(err.str()); } - if (this->RelaxedMode) { + if (this->MocRelaxedMode) { this->ParseCppFile(absFilename, headerExtensions, includedMocs, uiFiles); } else { this->StrictParseCppFile(absFilename, headerExtensions, includedMocs, diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 08d7e03..b26b307 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -132,7 +132,7 @@ private: bool RunUicFailed; bool RunRccFailed; bool GenerateAll; - bool RelaxedMode; + bool MocRelaxedMode; }; #endif |