[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.232.2.4 1.232.2.5 cmStandardIncludes.h 1.76.2.1 1.76.2.2 cmStringCommand.cxx 1.28.2.2 1.28.2.3 cmStringCommand.h 1.29.2.1 1.29.2.2 ctest.cxx 1.108.2.1 1.108.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Nov 11 13:34:18 EST 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv11010/Source
Modified Files:
Tag: CMake-2-8
cmGlobalXCodeGenerator.cxx cmStandardIncludes.h
cmStringCommand.cxx cmStringCommand.h ctest.cxx
Log Message:
CMake 2.8.0-rc7
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.232.2.4
retrieving revision 1.232.2.5
diff -C 2 -d -r1.232.2.4 -r1.232.2.5
*** cmGlobalXCodeGenerator.cxx 3 Nov 2009 22:25:02 -0000 1.232.2.4
--- cmGlobalXCodeGenerator.cxx 11 Nov 2009 18:34:15 -0000 1.232.2.5
***************
*** 1522,1525 ****
--- 1522,1535 ----
extraLinkOptions += targetLinkFlags;
}
+ if(configName && *configName)
+ {
+ std::string linkFlagsVar = "LINK_FLAGS_";
+ linkFlagsVar += cmSystemTools::UpperCase(configName);
+ if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
+ {
+ extraLinkOptions += " ";
+ extraLinkOptions += linkFlags;
+ }
+ }
// Get the product name components.
Index: cmStringCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmStringCommand.cxx,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -C 2 -d -r1.28.2.2 -r1.28.2.3
*** cmStringCommand.cxx 9 Oct 2009 20:11:19 -0000 1.28.2.2
--- cmStringCommand.cxx 11 Nov 2009 18:34:16 -0000 1.28.2.3
***************
*** 701,704 ****
--- 701,707 ----
}
+ static bool seeded = false;
+ bool force_seed = false;
+ int seed = (int) time(NULL);
int length = 5;
const char cmStringCommandDefaultAlphabet[] = "qwertyuiopasdfghjklzxcvbnm"
***************
*** 724,727 ****
--- 727,736 ----
alphabet = args[i];
}
+ else if ( args[i] == "RANDOM_SEED" )
+ {
+ ++i;
+ seed = atoi(args[i].c_str());
+ force_seed = true;
+ }
}
}
***************
*** 745,749 ****
std::vector<char> result;
! srand((int)time(NULL));
const char* alphaPtr = alphabet.c_str();
int cc;
--- 754,764 ----
std::vector<char> result;
!
! if (!seeded || force_seed)
! {
! seeded = true;
! srand(seed);
! }
!
const char* alphaPtr = alphabet.c_str();
int cc;
Index: cmStringCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmStringCommand.h,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -C 2 -d -r1.29.2.1 -r1.29.2.2
*** cmStringCommand.h 1 Oct 2009 21:21:08 -0000 1.29.2.1
--- cmStringCommand.h 11 Nov 2009 18:34:16 -0000 1.29.2.2
***************
*** 90,94 ****
" string(STRIP <string> <output variable>)\n"
" string(RANDOM [LENGTH <length>] [ALPHABET <alphabet>]\n"
! " <output variable>)\n"
"REGEX MATCH will match the regular expression once and store the "
"match in the output variable.\n"
--- 90,94 ----
" string(STRIP <string> <output variable>)\n"
" string(RANDOM [LENGTH <length>] [ALPHABET <alphabet>]\n"
! " [RANDOM_SEED <seed>] <output variable>)\n"
"REGEX MATCH will match the regular expression once and store the "
"match in the output variable.\n"
***************
*** 116,120 ****
"characters from the given alphabet. Default length is 5 "
"characters and default alphabet is all numbers and upper and "
! "lower case letters.\n"
"The following characters have special meaning in regular expressions:\n"
" ^ Matches at beginning of a line\n"
--- 116,121 ----
"characters from the given alphabet. Default length is 5 "
"characters and default alphabet is all numbers and upper and "
! "lower case letters. If an integer RANDOM_SEED is given, its "
! "value will be used to seed the random number generator.\n"
"The following characters have special meaning in regular expressions:\n"
" ^ Matches at beginning of a line\n"
Index: cmStandardIncludes.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmStandardIncludes.h,v
retrieving revision 1.76.2.1
retrieving revision 1.76.2.2
diff -C 2 -d -r1.76.2.1 -r1.76.2.2
*** cmStandardIncludes.h 1 Oct 2009 21:21:08 -0000 1.76.2.1
--- cmStandardIncludes.h 11 Nov 2009 18:34:16 -0000 1.76.2.2
***************
*** 19,23 ****
// include configure generated header to define CMAKE_NO_ANSI_STREAM_HEADERS,
// CMAKE_NO_STD_NAMESPACE, and other macros.
! #include "cmConfigure.h"
#include <cmsys/Configure.hxx>
--- 19,23 ----
// include configure generated header to define CMAKE_NO_ANSI_STREAM_HEADERS,
// CMAKE_NO_STD_NAMESPACE, and other macros.
! #include <cmConfigure.h>
#include <cmsys/Configure.hxx>
Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.108.2.1
retrieving revision 1.108.2.2
diff -C 2 -d -r1.108.2.1 -r1.108.2.2
*** ctest.cxx 1 Oct 2009 21:21:11 -0000 1.108.2.1
--- ctest.cxx 11 Nov 2009 18:34:16 -0000 1.108.2.2
***************
*** 213,216 ****
--- 213,223 ----
"multiple times and submit all stages to the same dashboard (Dart2 "
"required). Each execution requires different index." },
+ {"--help-command <cmd> [<file>]", "Show help for a single command and exit.",
+ "Prints the help for the command to stdout or to the specified file." },
+ {"--help-command-list [<file>]", "List available commands and exit.",
+ "Prints the list of all available listfile commands to stdout or the "
+ "specified file." },
+ {"--help-commands [<file>]", "Print help for all commands and exit.",
+ "Prints the help for all commands to stdout or to the specified file." },
{0,0,0}
};
More information about the Cmake-commits
mailing list