From ca124a15150b5f88a9dcd9edfc4f61cf473efc64 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 11 Oct 2013 14:26:55 +0200 Subject: Rename the AutomocInfo.cmake file to be more generic. --- Modules/AutogenInfo.cmake.in | 14 ++++++++++++++ Modules/AutomocInfo.cmake.in | 14 -------------- Source/cmQtAutoGenerators.cxx | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 Modules/AutogenInfo.cmake.in delete mode 100644 Modules/AutomocInfo.cmake.in diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in new file mode 100644 index 0000000..9cff735 --- /dev/null +++ b/Modules/AutogenInfo.cmake.in @@ -0,0 +1,14 @@ +set(AM_SOURCES @_moc_files@ ) +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_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@/") +set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@") +set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") +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_RELAXED_MODE "@_moc_relaxed_mode@") diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in deleted file mode 100644 index 9cff735..0000000 --- a/Modules/AutomocInfo.cmake.in +++ /dev/null @@ -1,14 +0,0 @@ -set(AM_SOURCES @_moc_files@ ) -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_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@/") -set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@") -set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") -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_RELAXED_MODE "@_moc_relaxed_mode@") diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 5fbdb83..9016827 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -429,9 +429,9 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target) const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT"); std::string inputFile = cmakeRoot; - inputFile += "/Modules/AutomocInfo.cmake.in"; + inputFile += "/Modules/AutogenInfo.cmake.in"; std::string outputFile = targetDir; - outputFile += "/AutomocInfo.cmake"; + outputFile += "/AutogenInfo.cmake"; makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(), false, true, false); @@ -519,7 +519,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile, { std::string filename(cmSystemTools::CollapseFullPath(targetDirectory)); cmSystemTools::ConvertToUnixSlashes(filename); - filename += "/AutomocInfo.cmake"; + filename += "/AutogenInfo.cmake"; if (!makefile->ReadListFile(0, filename.c_str())) { -- cgit v0.12