Commit cb408079 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge in a few more fixes from the main tree

parent f9ae916a
......@@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 4)
SET(CMake_VERSION_PATCH 7)
# for an actual release this should not be defined
SET(CMake_VERSION_RC 7)
SET(CMake_VERSION_RC 8)
SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
......
Changes in CMake 2.4.7
--- RC 8 ---
* Fix bug 5121 crash with build test on and vs
* Fix bug 5096 add_library and EXCLUDE_FROM_ALL not working
--- RC 7 ---
* Fix @ in Xcode projects
......
......@@ -38,8 +38,8 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
// If the second argument is "SHARED" or "STATIC", then it controls
// the type of library. Otherwise, it is treated as a source or
// source list name.
if(s != args.end())
// source list name. There man be two keyword arguments, check for them
while ( s != args.end() )
{
std::string libType = *s;
if(libType == "STATIC")
......@@ -62,6 +62,10 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
++s;
in_all = false;
}
else
{
break;
}
}
if (s == args.end())
......
......@@ -1346,7 +1346,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
if(cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.')
{
singleLine.push_back("-C");
singleLine.push_back(mf->GetDefinition("CMAKE_CFG_INTDIR"));
singleLine.push_back(cmakeCfgIntDir);
}
else // TODO: This is a hack. Should be something to do with the generator
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment