kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix installation of cmake-gui by CMake 2.4 

When CMake 2.4 generates the build tree for CMake itself it asks the
built CMake to install itself using the rules that 2.4 generated.  Since
the install rules use undocumented commands that are not compatible from
2.4 to 2.6 we need a special case to avoid failure.  This sets a special
indicator variable in the install rules that enables a compatibility
hack to support the old install rule format.
This commit is contained in:
Brad King 2009-01-05 11:05:57 -05:00
parent e2fa035c70
commit 86aeefc7c9
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/QtDialog/CMakeLists.txt
View File

@ -72,6 +72,11 @@ ELSE(NOT QT4_FOUND)
ENDIF(APPLE)
SET(CMAKE_INSTALL_DESTINATION_ARGS
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
# Since the built CMake will install itself instead of the
# generating CMake, tell it that the install rules were generated
# by CMake 2.4.
INSTALL(CODE "SET(CMAKE_INSTALL_SELF_2_4 1)")
ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
# if qt is not static and we are on windows then skip the install
# I don't want to distribute qt dlls

17
Source/cmFileCommand.cxx
View File

@ -1690,7 +1690,7 @@ bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
std::string stype = "FILES";
enum Doing { DoingNone, DoingFiles, DoingProperties,
DoingPermissionsFile, DoingPermissionsDir,
DoingPermissionsMatch };
DoingPermissionsMatch, DoingSelf24 };
Doing doing = DoingNone;
bool use_given_permissions_file = false;
bool use_given_permissions_dir = false;
@ -1844,6 +1844,14 @@ bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
}
else if ( *cstr == "COMPONENTS" )
{
if(this->Makefile->IsOn("CMAKE_INSTALL_SELF_2_4"))
{
// When CMake 2.4 builds this CMake version we need to support
// the install scripts it generates since it asks this CMake
// to install itself using the rules it generated.
doing = DoingSelf24;
continue;
}
cmOStringStream e;
e << "INSTALL called with old-style COMPONENTS argument. "
<< "This script was generated with an older version of CMake. "
@ -1903,6 +1911,13 @@ bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
return false;
}
}
else if(doing == DoingSelf24)
{
// Ignore these arguments for compatibility. This should be
// reached only when CMake 2.4 is installing the current
// CMake. It can be removed when CMake 2.6 or higher is
// required to build CMake.
}
else
{
this->SetError("called with inappropriate arguments");