[cmake-commits] king committed cmInstallFilesCommand.cxx 1.26 1.27
cmInstallFilesCommand.h 1.20 1.21
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri May 25 11:08:54 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv25110
Modified Files:
cmInstallFilesCommand.cxx cmInstallFilesCommand.h
Log Message:
BUG: Fix FILES mode after recent changes.
Index: cmInstallFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cmInstallFilesCommand.cxx 25 May 2007 15:01:20 -0000 1.26
+++ cmInstallFilesCommand.cxx 25 May 2007 15:08:52 -0000 1.27
@@ -47,6 +47,7 @@
std::string f = this->FindInstallSource(s->c_str());
this->Files.push_back(f);
}
+ this->CreateInstallGenerator();
}
else
{
@@ -112,6 +113,11 @@
}
}
+ this->CreateInstallGenerator();
+}
+
+void cmInstallFilesCommand::CreateInstallGenerator() const
+{
// Construct the destination. This command always installs under
// the prefix.
std::string destination = "${CMAKE_INSTALL_PREFIX}";
@@ -130,6 +136,7 @@
no_component, no_rename));
}
+
/**
* Find a file in the build or source tree for installation given a
* relative path from the CMakeLists.txt file. This will favor files
Index: cmInstallFilesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cmInstallFilesCommand.h 23 May 2007 19:40:12 -0000 1.20
+++ cmInstallFilesCommand.h 25 May 2007 15:08:52 -0000 1.21
@@ -103,6 +103,7 @@
cmTypeMacro(cmInstallFilesCommand, cmCommand);
protected:
+ void CreateInstallGenerator() const;
std::string FindInstallSource(const char* name) const;
private:
More information about the Cmake-commits
mailing list