reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-03 10:31:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QtAutogen: Rename config AM_RELAXED_MODE to AM_MOC_RELAXED_MODE

Browse Source
This commit is contained in:
Sebastian Holtermann 2016-11-30 13:14:23 +01:00
parent 4fa858ecb1
commit 48180401d3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/AutogenInfo.cmake.in
View File

@ -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@)

4
Source/cmQtAutoGenerators.cxx
View File

@ -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,

2
Source/cmQtAutoGenerators.h
View File

@ -132,7 +132,7 @@ private:
bool RunUicFailed;
bool RunRccFailed;
bool GenerateAll;
bool RelaxedMode;
bool MocRelaxedMode;
};
#endif