[cmake-commits] hoffman committed cmDependsFortran.cxx 1.18.2.1
1.18.2.2 cmFileCommand.h 1.16.2.4 1.16.2.5
cmFindPackageCommand.h 1.10.2.1 1.10.2.2 cmIfCommand.cxx
1.62.2.5 1.62.2.6 cmIfCommand.h 1.32.2.6 1.32.2.7
cmInstallCommand.cxx 1.10.2.2 1.10.2.3 cmInstallCommand.h
1.9.2.3 1.9.2.4 cmMakefile.cxx 1.335.2.14 1.335.2.15
cmRemoveDefinitionsCommand.h 1.3 1.3.2.1 cmSystemTools.cxx
1.327.2.4 1.327.2.5 cmTryRunCommand.h 1.9 1.9.2.1 cmake.cxx
1.247.2.10 1.247.2.11 cmakemain.cxx 1.50.2.4 1.50.2.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 25 14:03:51 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv31217/Source
Modified Files:
Tag: CMake-2-4
cmDependsFortran.cxx cmFileCommand.h cmFindPackageCommand.h
cmIfCommand.cxx cmIfCommand.h cmInstallCommand.cxx
cmInstallCommand.h cmMakefile.cxx cmRemoveDefinitionsCommand.h
cmSystemTools.cxx cmTryRunCommand.h cmake.cxx cmakemain.cxx
Log Message:
ENH: merge in stuff from head
Index: cmDependsFortran.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsFortran.cxx,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- cmDependsFortran.cxx 11 May 2006 02:15:09 -0000 1.18.2.1
+++ cmDependsFortran.cxx 25 Oct 2007 18:03:48 -0000 1.18.2.2
@@ -139,7 +139,6 @@
makeDepends << std::endl;
// Write module requirements to the output stream.
- internalDepends << obj << ".requires" << std::endl;
for(std::set<cmStdString>::const_iterator i = parser.Requires.begin();
i != parser.Requires.end(); ++i)
{
@@ -149,18 +148,15 @@
// since we require some things add them to our list of requirements
makeDepends << obj << ".requires: " << i->c_str() << ".mod.proxy"
<< std::endl;
- internalDepends << " " << i->c_str() << ".mod.proxy" << std::endl;
}
}
// Write provided modules to the output stream.
- internalDepends << obj << ".mod.proxy" << std::endl;
for(std::set<cmStdString>::const_iterator i = parser.Provides.begin();
i != parser.Provides.end(); ++i)
{
makeDepends << i->c_str() << ".mod.proxy: " << obj
<< ".provides" << std::endl;
- internalDepends << " " << i->c_str() << ".provides" << std::endl;
}
// If any modules are provided then they must be converted to stamp files.
Index: cmIfCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIfCommand.cxx,v
retrieving revision 1.62.2.5
retrieving revision 1.62.2.6
diff -u -d -r1.62.2.5 -r1.62.2.6
--- cmIfCommand.cxx 15 Feb 2007 17:45:07 -0000 1.62.2.5
+++ cmIfCommand.cxx 25 Oct 2007 18:03:48 -0000 1.62.2.6
@@ -303,6 +303,22 @@
IncrementArguments(newArgs,argP1,argP2);
reducible = 1;
}
+ // is the given path an absolute path ?
+ if (*arg == "IS_ABSOLUTE" && argP1 != newArgs.end())
+ {
+ if(cmSystemTools::FileIsFullPath((argP1)->c_str()))
+ {
+ *arg = "1";
+ }
+ else
+ {
+ *arg = "0";
+ }
+ newArgs.erase(argP1);
+ argP1 = arg;
+ IncrementArguments(newArgs,argP1,argP2);
+ reducible = 1;
+ }
// does a command exist
if (*arg == "COMMAND" && argP1 != newArgs.end())
{
Index: cmTryRunCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryRunCommand.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- cmTryRunCommand.h 13 Dec 2005 20:12:37 -0000 1.9
+++ cmTryRunCommand.h 25 Oct 2007 18:03:48 -0000 1.9.2.1
@@ -61,16 +61,15 @@
{
return
" TRY_RUN(RUN_RESULT_VAR COMPILE_RESULT_VAR\n"
- " bindir srcfile <CMAKE_FLAGS <Flags>>\n"
- " <COMPILE_DEFINITIONS <flags>>\n"
- " <OUTPUT_VARIABLE var>\n"
- " <ARGS <arg1> <arg2>...>)\n"
- "Try compiling a srcfile. Return the success or failure in "
- "COMPILE_RESULT_VAR. Then if the compile succeeded, run the "
- "executable and return the result in RUN_RESULT_VAR. "
- "If the executable was built, but failed for to run for some "
- "reason, then RUN_RESULT_VAR will be set to FAILED_TO_RUN, and "
- "the output will be in the COMPILE_RESULT_VAR. OUTPUT_VARIABLE "
+ " bindir srcfile [CMAKE_FLAGS <Flags>]\n"
+ " [COMPILE_DEFINITIONS <flags>]\n"
+ " [OUTPUT_VARIABLE var]\n"
+ " [ARGS <arg1> <arg2>...])\n"
+ "Try compiling a srcfile. Return TRUE or FALSE for success or failure "
+ "in COMPILE_RESULT_VAR. Then if the compile succeeded, run the "
+ "executable and return its exit code in RUN_RESULT_VAR. "
+ "If the executable was built, but failed to run, then RUN_RESULT_VAR "
+ "will be set to FAILED_TO_RUN. OUTPUT_VARIABLE "
"specifies the name of the variable to put all of the standard "
"output and standard error into.";
}
Index: cmIfCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIfCommand.h,v
retrieving revision 1.32.2.6
retrieving revision 1.32.2.7
diff -u -d -r1.32.2.6 -r1.32.2.7
--- cmIfCommand.h 17 May 2007 18:41:52 -0000 1.32.2.6
+++ cmIfCommand.h 25 Oct 2007 18:03:48 -0000 1.32.2.7
@@ -143,6 +143,8 @@
" IF(IS_DIRECTORY directory-name)\n"
"True if the given name is a directory. "
"Behavior is well-defined only for full paths.\n"
+ " IF(IS_ABSOLUTE path)\n"
+ "True if the given path is an absolute path.\n "
" IF(variable MATCHES regex)\n"
" IF(string MATCHES regex)\n"
"True if the given string or variable's value matches the given "
Index: cmFindPackageCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.h,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- cmFindPackageCommand.h 27 Oct 2006 20:01:47 -0000 1.10.2.1
+++ cmFindPackageCommand.h 25 Oct 2007 18:03:48 -0000 1.10.2.2
@@ -66,7 +66,7 @@
{
return
" FIND_PACKAGE(<name> [major.minor] [QUIET] [NO_MODULE]\n"
- " [[REQUIRED|COMPONENTS] [componets...]])\n"
+ " [[REQUIRED|COMPONENTS] [components...]])\n"
"Finds and loads settings from an external project. <name>_FOUND will "
"be set to indicate whether the package was found. Settings that "
"can be used when <name>_FOUND is true are package-specific. The "
Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.327.2.4
retrieving revision 1.327.2.5
diff -u -d -r1.327.2.4 -r1.327.2.5
--- cmSystemTools.cxx 5 Feb 2007 18:21:32 -0000 1.327.2.4
+++ cmSystemTools.cxx 25 Oct 2007 18:03:48 -0000 1.327.2.5
@@ -1582,11 +1582,18 @@
char* realName = new char[ strlen(outFileName) + 1 ];
std::auto_ptr<char> realNamePtr(realName);
strcpy(realName, outFileName);
+ int options = 0;
+ if(verbose)
+ {
+ options != TAR_VERBOSE;
+ }
+#ifdef __CYGWIN__
+ options |= TAR_GNU;
+#endif
if (tar_open(&t, realName,
(gzip? &gztype : NULL),
O_WRONLY | O_CREAT, 0644,
- (verbose?TAR_VERBOSE:0)
- | 0) == -1)
+ options) == -1)
{
cmSystemTools::Error("Problem with tar_open(): ", strerror(errno));
return false;
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.247.2.10
retrieving revision 1.247.2.11
diff -u -d -r1.247.2.10 -r1.247.2.11
--- cmake.cxx 29 Jun 2007 16:58:18 -0000 1.247.2.10
+++ cmake.cxx 25 Oct 2007 18:03:48 -0000 1.247.2.11
@@ -791,7 +791,8 @@
" line\n"
<< " environment - display the current enviroment\n"
<< " make_directory dir - create a directory\n"
- << " remeove file1 file2 ... - remove the file(s)\n"
+ << " remove [-f] file1 file2 ... - remove the file(s), use -f to force "
+ "it\n"
<< " tar [cxt][vfz] file.tar file/dir1 file/dir2 ... - create a tar.\n"
<< " time command [args] ... - run command and return elapsed time\n"
#if defined(_WIN32) && !defined(__CYGWIN__)
Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- cmInstallCommand.cxx 13 Oct 2006 14:52:02 -0000 1.10.2.2
+++ cmInstallCommand.cxx 25 Oct 2007 18:03:48 -0000 1.10.2.3
@@ -145,9 +145,9 @@
std::string archive_permissions;
std::string library_permissions;
std::string runtime_permissions;
- std::string archive_component;
- std::string library_component;
- std::string runtime_component;
+ std::string archive_component = "Unspecified";
+ std::string library_component = "Unspecified";
+ std::string runtime_component = "Unspecified";
std::vector<std::string> archive_configurations;
std::vector<std::string> library_configurations;
std::vector<std::string> runtime_configurations;
@@ -569,7 +569,7 @@
std::string rename;
std::string permissions;
std::vector<std::string> configurations;
- std::string component;
+ std::string component = "Unspecified";
bool optional = false;
for(unsigned int i=1; i < args.size(); ++i)
{
@@ -758,7 +758,7 @@
std::string permissions_file;
std::string permissions_dir;
std::vector<std::string> configurations;
- std::string component;
+ std::string component = "Unspecified";
std::string literal_args;
for(unsigned int i=1; i < args.size(); ++i)
{
Index: cmakemain.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmakemain.cxx,v
retrieving revision 1.50.2.4
retrieving revision 1.50.2.5
diff -u -d -r1.50.2.4 -r1.50.2.5
--- cmakemain.cxx 13 Oct 2006 14:52:06 -0000 1.50.2.4
+++ cmakemain.cxx 25 Oct 2007 18:03:48 -0000 1.50.2.5
@@ -78,7 +78,8 @@
{"-P <file>", "Process script mode.",
"Process the given cmake file as a script written in the CMake language. "
"No configure or generate step is performed and the cache is not"
- " modified."},
+ " modified. If variables are defined using -D, this must be done "
+ "before the -P argument."},
{"--graphviz=[file]", "Generate graphviz of dependencies.",
"Generate a graphviz input file that will contain all the library and "
"executable dependencies in the project."},
Index: cmRemoveDefinitionsCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmRemoveDefinitionsCommand.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- cmRemoveDefinitionsCommand.h 10 Mar 2006 16:13:14 -0000 1.3
+++ cmRemoveDefinitionsCommand.h 25 Oct 2007 18:03:48 -0000 1.3.2.1
@@ -66,7 +66,7 @@
" REMOVE_DEFINITIONS(-DFOO -DBAR ...)\n"
"Removes flags from command line of C and C++ compilers. "
"This command can be used to remove any flag from a compile line, "
- "but the -D flag is accepted most C/C++ compilers. "
+ "but the -D flag is accepted by most C/C++ compilers. "
"Other flags may not be as portable.";
}
Index: cmInstallCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.h,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -d -r1.9.2.3 -r1.9.2.4
--- cmInstallCommand.h 13 Oct 2006 14:52:02 -0000 1.9.2.3
+++ cmInstallCommand.h 25 Oct 2007 18:03:48 -0000 1.9.2.4
@@ -69,12 +69,12 @@
"There are multiple signatures for this command. Some of them define "
"installation properties for files and targets. Properties common to "
"multiple signatures are covered here but they are valid only for "
- "signatures that specify them. "
+ "signatures that specify them.\n"
"DESTINATION arguments specify "
"the directory on disk to which a file will be installed. "
"If a full path (with a leading slash or drive letter) is given it "
"is used directly. If a relative path is given it is interpreted "
- "relative to the value of CMAKE_INSTALL_PREFIX. "
+ "relative to the value of CMAKE_INSTALL_PREFIX.\n"
"PERMISSIONS arguments specify permissions for installed files. "
"Valid permissions are "
"OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, "
@@ -82,17 +82,17 @@
"WORLD_READ, WORLD_WRITE, WORLD_EXECUTE, "
"SETUID, and SETGID. "
"Permissions that do not make sense on certain platforms are ignored "
- "on those platforms. "
+ "on those platforms.\n"
"The CONFIGURATIONS argument specifies a list of build configurations "
- "for which the install rule applies (Debug, Release, etc.). "
+ "for which the install rule applies (Debug, Release, etc.).\n"
"The COMPONENT argument specifies an installation component name "
"with which the install rule is associated, such as \"runtime\" or "
"\"development\". During component-specific installation only "
"install rules associated with the given component name will be "
- "executed. During a full installation all components are installed. "
+ "executed. During a full installation all components are installed.\n"
"The RENAME argument specifies a name for an installed file that "
"may be different from the original file. Renaming is allowed only "
- "when a single file is installed by the command. "
+ "when a single file is installed by the command.\n"
"The OPTIONAL argument specifies that it is not an error if the "
"file to be installed does not exist. "
"\n"
Index: cmFileCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.h,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -d -r1.16.2.4 -r1.16.2.5
--- cmFileCommand.h 29 Jun 2007 16:58:18 -0000 1.16.2.4
+++ cmFileCommand.h 25 Oct 2007 18:03:48 -0000 1.16.2.5
@@ -70,9 +70,9 @@
" FILE(GLOB variable [RELATIVE path] [globbing expressions]...)\n"
" FILE(GLOB_RECURSE variable [RELATIVE path] \n"
" [globbing expressions]...)\n"
- " FILE(REMOVE [directory]...)\n"
- " FILE(REMOVE_RECURSE [directory]...)\n"
- " FILE(MAKE_DIRECTORY [directory]...)\n"
+ " FILE(REMOVE [file1 ...])\n"
+ " FILE(REMOVE_RECURSE [file1 ...])\n"
+ " FILE(MAKE_DIRECTORY [directory1 directory2 ...])\n"
" FILE(RELATIVE_PATH variable directory file)\n"
" FILE(TO_CMAKE_PATH path result)\n"
" FILE(TO_NATIVE_PATH path result)\n"
@@ -101,7 +101,11 @@
"match the files.\n"
"Examples of recursive globbing include:\n"
" /dir/*.py - match all python files in /dir and subdirectories\n"
- "MAKE_DIRECTORY will create a directory at the specified location\n"
+ "MAKE_DIRECTORY will create the given directories, also if their parent "
+ "directories don't exist yet\n"
+ "REMOVE will remove the given files, also in subdirectories\n"
+ "REMOVE_RECURSE will remove the given files and directories, also "
+ "non-empty directories\n"
"RELATIVE_PATH will determine relative path from directory to the given"
" file.\n"
"TO_CMAKE_PATH will convert path into a cmake style path with unix /. "
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.335.2.14
retrieving revision 1.335.2.15
diff -u -d -r1.335.2.14 -r1.335.2.15
--- cmMakefile.cxx 29 Jun 2007 16:58:18 -0000 1.335.2.14
+++ cmMakefile.cxx 25 Oct 2007 18:03:48 -0000 1.335.2.15
@@ -2500,9 +2500,8 @@
}
else
{
- cmSystemTools::ReplaceString(line, "#cmakedefine", "#undef");
- output += "/* ";
- output += line;
+ output += "/* #undef ";
+ output += this->cmDefineRegex.match(1);
output += " */";
}
}
More information about the Cmake-commits
mailing list