diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/cmConditionEvaluator.cxx | 19 | ||||
| -rw-r--r-- | Source/cmConditionEvaluator.h | 3 | ||||
| -rw-r--r-- | Source/cmIfCommand.cxx | 8 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmWhileCommand.cxx | 4 |
6 files changed, 12 insertions, 29 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6235b66..9ccf7a8 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 5) -set(CMake_VERSION_PATCH 20160329) +set(CMake_VERSION_PATCH 20160331) #set(CMake_VERSION_RC 1) diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 305ebe3..64c5980 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -131,25 +131,6 @@ bool cmConditionEvaluator::IsTrue( errorString, status, true); } -cmListFileContext cmConditionEvaluator::GetConditionContext( - cmMakefile* mf, - const cmCommandContext& command, - const std::string& filePath) -{ - cmListFileContext context = - cmListFileContext::FromCommandContext( - command, - filePath); - - if(!mf->GetCMakeInstance()->GetIsInTryCompile()) - { - cmOutputConverter converter(mf->GetStateSnapshot()); - context.FilePath = converter.Convert(context.FilePath, - cmOutputConverter::HOME); - } - return context; -} - //========================================================================= const char* cmConditionEvaluator::GetDefinitionIfUnquoted( cmExpandedCommandArgument const& argument) const diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h index 8600825..3ed512d 100644 --- a/Source/cmConditionEvaluator.h +++ b/Source/cmConditionEvaluator.h @@ -33,9 +33,6 @@ public: std::string &errorString, cmake::MessageType &status); - static cmListFileContext GetConditionContext(cmMakefile* mf, - const cmCommandContext& command, std::string const& filePath); - private: // Filter the given variable definition based on policy CMP0054. const char* GetDefinitionIfUnquoted( diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 5964ef1..9a07dde 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -108,8 +108,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmake::MessageType messType; cmListFileContext conditionContext = - cmConditionEvaluator::GetConditionContext( - &mf, this->Functions[c], + cmListFileContext::FromCommandContext( + this->Functions[c], this->GetStartingContext().FilePath); cmConditionEvaluator conditionEvaluator( @@ -210,8 +210,8 @@ bool cmIfCommand commandContext.Name = execContext.Name; cmConditionEvaluator conditionEvaluator( - *(this->Makefile), cmConditionEvaluator::GetConditionContext( - this->Makefile, commandContext, execContext.FilePath), + *(this->Makefile), cmListFileContext::FromCommandContext( + commandContext, execContext.FilePath), this->Makefile->GetBacktrace()); bool isTrue = conditionEvaluator.IsTrue( diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index abae564..2f66517 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -378,6 +378,11 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFortranFlagTable[] = {"FloatingPointExceptionHandling", "fpe:1", "", "fpe1", 0}, {"FloatingPointExceptionHandling", "fpe:3", "", "fpe3", 0}, + {"MultiProcessorCompilation", "MP", "", "true", + cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, + {"ProcessorNumber", "MP", "Multi-processor Compilation", "", + cmVS7FlagTable::UserValueRequired}, + {"ModulePath", "module:", "", "", cmVS7FlagTable::UserValueRequired}, {"LoopUnrolling", "Qunroll:", "", "", diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index 4b7afd8..aabbe27 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -56,8 +56,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, commandContext.Name = execContext.Name; cmListFileContext conditionContext = - cmConditionEvaluator::GetConditionContext( - &mf, commandContext, + cmListFileContext::FromCommandContext( + commandContext, this->GetStartingContext().FilePath); cmConditionEvaluator conditionEvaluator( |