diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmFileCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 37 |
4 files changed, 29 insertions, 15 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index bd92879..c3bee5b 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 20170512) +set(CMake_VERSION_PATCH 20170516) #set(CMake_VERSION_RC 1) diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index c873529..3e113d3 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -795,6 +795,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmsys::Glob glA; glA.RecurseOn(); glA.SetRecurseListDirs(true); + glA.SetRecurseThroughSymlinks(false); glA.FindFiles(findExpr); std::vector<std::string> filesAfter = glA.GetFiles(); std::sort(filesAfter.begin(), filesAfter.end()); diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 2c25e9b..ff6e2b7 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -44,6 +44,10 @@ #include "cmELF.h" #endif +#if defined(_WIN32) +#include <windows.h> +#endif + class cmSystemToolsFileTime; // Table of permissions flags. diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 7461a0a..d40e809 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -396,6 +396,14 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( if (this->MocEnabled()) { InfoGet(makefile, "AM_MOC_SKIP", this->MocSkipList); InfoGet(makefile, "AM_MOC_DEFINITIONS", config, this->MocDefinitions); +#ifdef _WIN32 + { + const std::string win32("WIN32"); + if (!ListContains(this->MocDefinitions, win32)) { + this->MocDefinitions.push_back(win32); + } + } +#endif InfoGet(makefile, "AM_MOC_INCLUDES", config, this->MocIncludePaths); InfoGet(makefile, "AM_MOC_OPTIONS", this->MocOptions); InfoGet(makefile, "AM_MOC_RELAXED_MODE", this->MocRelaxedMode); @@ -517,32 +525,39 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile) // Compose current settings strings { cmCryptoHash crypt(cmCryptoHash::AlgoSHA256); + const std::string sep(" ~~~ "); if (this->MocEnabled()) { std::string str; + str += this->MocExecutable; + str += sep; str += JoinOptionsList(this->MocDefinitions); - str += " ~~~ "; + str += sep; str += JoinOptionsList(this->MocIncludePaths); - str += " ~~~ "; + str += sep; str += JoinOptionsList(this->MocOptions); - str += " ~~~ "; + str += sep; str += this->IncludeProjectDirsBefore ? "TRUE" : "FALSE"; - str += " ~~~ "; + str += sep; str += JoinOptionsList(this->MocPredefsCmd); - str += " ~~~ "; + str += sep; this->SettingsStringMoc = crypt.HashString(str); } if (this->UicEnabled()) { std::string str; + str += this->UicExecutable; + str += sep; str += JoinOptionsList(this->UicTargetOptions); - str += " ~~~ "; + str += sep; str += JoinOptionsMap(this->UicOptions); - str += " ~~~ "; + str += sep; this->SettingsStringUic = crypt.HashString(str); } if (this->RccEnabled()) { std::string str; + str += this->RccExecutable; + str += sep; str += JoinOptionsMap(this->RccOptions); - str += " ~~~ "; + str += sep; this->SettingsStringRcc = crypt.HashString(str); } } @@ -1214,9 +1229,6 @@ bool cmQtAutoGenerators::MocGenerateAll( this->MocDefinitions.begin(); it != this->MocDefinitions.end(); ++it) { cmd.push_back("-D" + (*it)); -#ifdef _WIN32 - cmd.push_back("-DWIN32"); -#endif } // Add options cmd.insert(cmd.end(), this->MocOptions.begin(), @@ -1362,9 +1374,6 @@ bool cmQtAutoGenerators::MocGenerateFile( it != this->MocDefinitions.end(); ++it) { cmd.push_back("-D" + (*it)); } -#ifdef _WIN32 - cmd.push_back("-DWIN32"); -#endif // Add options cmd.insert(cmd.end(), this->MocOptions.begin(), this->MocOptions.end()); // Add predefs include |