Merge remote-tracking branch 'origin/maint'
This commit is contained in:
commit
544402648f
|
@ -172,8 +172,12 @@ if(MSVC)
|
||||||
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
|
||||||
set(__install__libs
|
set(__install__libs
|
||||||
"${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
|
"${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
|
||||||
"${MSVC${v}_CRT_DIR}/msvcr${v}0.dll"
|
|
||||||
)
|
)
|
||||||
|
if(NOT v VERSION_LESS 14)
|
||||||
|
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll")
|
||||||
|
else()
|
||||||
|
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll")
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
set(__install__libs)
|
set(__install__libs)
|
||||||
endif()
|
endif()
|
||||||
|
@ -183,8 +187,12 @@ if(MSVC)
|
||||||
"${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugCRT")
|
"${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugCRT")
|
||||||
set(__install__libs ${__install__libs}
|
set(__install__libs ${__install__libs}
|
||||||
"${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
|
"${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
|
||||||
"${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll"
|
|
||||||
)
|
)
|
||||||
|
if(NOT v VERSION_LESS 14)
|
||||||
|
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll")
|
||||||
|
else()
|
||||||
|
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# CMake version number components.
|
# CMake version number components.
|
||||||
set(CMake_VERSION_MAJOR 3)
|
set(CMake_VERSION_MAJOR 3)
|
||||||
set(CMake_VERSION_MINOR 2)
|
set(CMake_VERSION_MINOR 2)
|
||||||
set(CMake_VERSION_PATCH 2)
|
set(CMake_VERSION_PATCH 3)
|
||||||
#set(CMake_VERSION_RC 0)
|
#set(CMake_VERSION_RC 0)
|
||||||
|
|
|
@ -67,13 +67,13 @@ static const char* cmCTestErrorMatches[] = {
|
||||||
"^CMake Error.*:",
|
"^CMake Error.*:",
|
||||||
":[ \\t]cannot find",
|
":[ \\t]cannot find",
|
||||||
":[ \\t]can't find",
|
":[ \\t]can't find",
|
||||||
": \\*\\*\\* No rule to make target \\[`'].*\\'. Stop",
|
": \\*\\*\\* No rule to make target [`'].*\\'. Stop",
|
||||||
": \\*\\*\\* No targets specified and no makefile found",
|
": \\*\\*\\* No targets specified and no makefile found",
|
||||||
": Invalid loader fixup for symbol",
|
": Invalid loader fixup for symbol",
|
||||||
": Invalid fixups exist",
|
": Invalid fixups exist",
|
||||||
": Can't find library for",
|
": Can't find library for",
|
||||||
": internal link edit command failed",
|
": internal link edit command failed",
|
||||||
": Unrecognized option \\[`'].*\\'",
|
": Unrecognized option [`'].*\\'",
|
||||||
"\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([^WI]\\)",
|
"\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([^WI]\\)",
|
||||||
"ld: 0706-006 Cannot find or open library file: -l ",
|
"ld: 0706-006 Cannot find or open library file: -l ",
|
||||||
"ild: \\(argument error\\) can't find library argument ::",
|
"ild: \\(argument error\\) can't find library argument ::",
|
||||||
|
|
|
@ -94,8 +94,8 @@ bool cmFunctionHelperCommand::InvokeInitialPass
|
||||||
}
|
}
|
||||||
|
|
||||||
// we push a scope on the makefile
|
// we push a scope on the makefile
|
||||||
cmMakefile::LexicalPushPop lexScope(this->Makefile);
|
|
||||||
cmMakefile::ScopePushPop varScope(this->Makefile);
|
cmMakefile::ScopePushPop varScope(this->Makefile);
|
||||||
|
cmMakefile::LexicalPushPop lexScope(this->Makefile);
|
||||||
static_cast<void>(varScope);
|
static_cast<void>(varScope);
|
||||||
|
|
||||||
// Push a weak policy scope which restores the policies recorded at
|
// Push a weak policy scope which restores the policies recorded at
|
||||||
|
|
|
@ -95,6 +95,7 @@ public:
|
||||||
* Set to true if the make tool being used is MinGW Make.
|
* Set to true if the make tool being used is MinGW Make.
|
||||||
*/
|
*/
|
||||||
void SetMinGWMake(bool v) {this->MinGWMake = v;}
|
void SetMinGWMake(bool v) {this->MinGWMake = v;}
|
||||||
|
bool IsMinGWMake() const { return this->MinGWMake; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set to true if the make tool being used is NMake.
|
* Set to true if the make tool being used is NMake.
|
||||||
|
|
|
@ -3284,6 +3284,7 @@ void cmMakefile::PopFunctionBlockerBarrier(bool reportError)
|
||||||
this->FunctionBlockerBarriers.back();
|
this->FunctionBlockerBarriers.back();
|
||||||
while(this->FunctionBlockers.size() > barrier)
|
while(this->FunctionBlockers.size() > barrier)
|
||||||
{
|
{
|
||||||
|
cmMakefile::LoopBlockPop loopBlockPop(this);
|
||||||
cmsys::auto_ptr<cmFunctionBlocker> fb(this->FunctionBlockers.back());
|
cmsys::auto_ptr<cmFunctionBlocker> fb(this->FunctionBlockers.back());
|
||||||
this->FunctionBlockers.pop_back();
|
this->FunctionBlockers.pop_back();
|
||||||
if(reportError)
|
if(reportError)
|
||||||
|
|
|
@ -668,6 +668,15 @@ cmMakefileTargetGenerator
|
||||||
this->Convert(targetFullPathCompilePDB,
|
this->Convert(targetFullPathCompilePDB,
|
||||||
cmLocalGenerator::START_OUTPUT,
|
cmLocalGenerator::START_OUTPUT,
|
||||||
cmLocalGenerator::SHELL);
|
cmLocalGenerator::SHELL);
|
||||||
|
|
||||||
|
if (this->LocalGenerator->IsMinGWMake() &&
|
||||||
|
cmHasLiteralSuffix(targetOutPathCompilePDB, "\\"))
|
||||||
|
{
|
||||||
|
// mingw32-make incorrectly interprets 'a\ b c' as 'a b' and 'c'
|
||||||
|
// (but 'a\ b "c"' as 'a\', 'b', and 'c'!). Workaround this by
|
||||||
|
// avoiding a trailing backslash in the argument.
|
||||||
|
targetOutPathCompilePDB[targetOutPathCompilePDB.size()-1] = '/';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cmLocalGenerator::RuleVariables vars;
|
cmLocalGenerator::RuleVariables vars;
|
||||||
vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
|
vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
|
@ -0,0 +1,8 @@
|
||||||
|
^CMake Error at FunctionUnmatchedForeach.cmake:[0-9]+ \(f\):
|
||||||
|
A logical block opening on the line
|
||||||
|
|
||||||
|
.*/Tests/RunCMake/Syntax/FunctionUnmatchedForeach.cmake:[0-9]+ \(foreach\)
|
||||||
|
|
||||||
|
is not closed.
|
||||||
|
Call Stack \(most recent call first\):
|
||||||
|
CMakeLists.txt:[0-9]+ \(include\)$
|
|
@ -0,0 +1,5 @@
|
||||||
|
function(f)
|
||||||
|
foreach(i 1)
|
||||||
|
#endforeach() # missing
|
||||||
|
endfunction()
|
||||||
|
f()
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
|
@ -0,0 +1,8 @@
|
||||||
|
^CMake Error at MacroUnmatchedForeach.cmake:[0-9]+ \(m\):
|
||||||
|
A logical block opening on the line
|
||||||
|
|
||||||
|
.*/Tests/RunCMake/Syntax/MacroUnmatchedForeach.cmake:[0-9]+ \(foreach\)
|
||||||
|
|
||||||
|
is not closed.
|
||||||
|
Call Stack \(most recent call first\):
|
||||||
|
CMakeLists.txt:[0-9]+ \(include\)$
|
|
@ -0,0 +1,5 @@
|
||||||
|
macro(m)
|
||||||
|
foreach(i 1)
|
||||||
|
#endforeach() # missing
|
||||||
|
endmacro()
|
||||||
|
m()
|
|
@ -108,3 +108,7 @@ run_cmake(CMP0053-NameWithNewlineQuoted)
|
||||||
run_cmake(CMP0053-NameWithCarriageReturnQuoted)
|
run_cmake(CMP0053-NameWithCarriageReturnQuoted)
|
||||||
run_cmake(CMP0053-NameWithEscapedSpacesQuoted)
|
run_cmake(CMP0053-NameWithEscapedSpacesQuoted)
|
||||||
run_cmake(CMP0053-NameWithEscapedTabsQuoted)
|
run_cmake(CMP0053-NameWithEscapedTabsQuoted)
|
||||||
|
|
||||||
|
# Function and macro tests.
|
||||||
|
run_cmake(FunctionUnmatchedForeach)
|
||||||
|
run_cmake(MacroUnmatchedForeach)
|
||||||
|
|
Loading…
Reference in New Issue