[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.137.2.1 1.137.2.2 CPU.h.in 1.2 1.2.2.1 ProcessUNIX.c 1.71.2.1 1.71.2.2 ProcessWin32.c 1.68 1.68.10.1 SystemInformation.cxx 1.22.2.2 1.22.2.3 SystemTools.cxx 1.222.2.2 1.222.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 15 15:40:03 EDT 2008
Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv17340/Source/kwsys
Modified Files:
Tag: CMake-2-6
CMakeLists.txt CPU.h.in ProcessUNIX.c ProcessWin32.c
SystemInformation.cxx SystemTools.cxx
Log Message:
ENH: merge in from main tree
Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C 2 -d -r1.22.2.2 -r1.22.2.3
*** SystemInformation.cxx 4 May 2008 22:07:27 -0000 1.22.2.2
--- SystemInformation.cxx 15 May 2008 19:40:00 -0000 1.22.2.3
***************
*** 2999,3003 ****
}
! sprintf (operatingSystem, "%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
--- 2999,3003 ----
}
! sprintf (operatingSystem, "%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
***************
*** 3048,3052 ****
{
// NB: NT 4.0 and earlier.
! sprintf (operatingSystem, "version %d.%d %s (Build %d)",
osvi.dwMajorVersion,
osvi.dwMinorVersion,
--- 3048,3052 ----
{
// NB: NT 4.0 and earlier.
! sprintf (operatingSystem, "version %ld.%ld %s (Build %ld)",
osvi.dwMajorVersion,
osvi.dwMinorVersion,
***************
*** 3079,3083 ****
{
// Windows 2000 and everything else.
! sprintf (operatingSystem,"%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
--- 3079,3083 ----
{
// Windows 2000 and everything else.
! sprintf (operatingSystem,"%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
Index: CPU.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CPU.h.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** CPU.h.in 27 Feb 2008 21:11:20 -0000 1.2
--- CPU.h.in 15 May 2008 19:40:00 -0000 1.2.2.1
***************
*** 33,36 ****
--- 33,44 ----
# define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_LITTLE
+ /* Arm */
+ #elif defined(__arm__)
+ # if !defined(__ARMEB__)
+ # define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_LITTLE
+ # else
+ # define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_BIG
+ # endif
+
/* Intel x86 */
#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.71.2.1
retrieving revision 1.71.2.2
diff -C 2 -d -r1.71.2.1 -r1.71.2.2
*** ProcessUNIX.c 2 Apr 2008 13:16:14 -0000 1.71.2.1
--- ProcessUNIX.c 15 May 2008 19:40:00 -0000 1.71.2.2
***************
*** 2808,2812 ****
}
}
! else if(isspace(*c))
{
if(in_argument)
--- 2808,2812 ----
}
}
! else if(isspace((unsigned char) *c))
{
if(in_argument)
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.137.2.1
retrieving revision 1.137.2.2
diff -C 2 -d -r1.137.2.1 -r1.137.2.2
*** CMakeLists.txt 18 Mar 2008 14:23:55 -0000 1.137.2.1
--- CMakeLists.txt 15 May 2008 19:40:00 -0000 1.137.2.2
***************
*** 123,126 ****
--- 123,134 ----
PROJECT(${KWSYS_NAMESPACE})
+ # Tell CMake how to follow dependencies of sources in this directory.
+ IF(COMMAND SET_PROPERTY)
+ SET_PROPERTY(DIRECTORY
+ PROPERTY IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
+ "KWSYS_HEADER(%)=<${KWSYS_NAMESPACE}/%>"
+ )
+ ENDIF(COMMAND SET_PROPERTY)
+
# Select library components.
IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
Index: ProcessWin32.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessWin32.c,v
retrieving revision 1.68
retrieving revision 1.68.10.1
diff -C 2 -d -r1.68 -r1.68.10.1
*** ProcessWin32.c 24 Jul 2007 14:05:31 -0000 1.68
--- ProcessWin32.c 15 May 2008 19:40:00 -0000 1.68.10.1
***************
*** 380,384 ****
/* Construct the executable name from the process id and kwsysProcess
instance. This should be unique. */
! sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%u_%p.exe",
GetCurrentProcessId(), cp);
--- 380,384 ----
/* Construct the executable name from the process id and kwsysProcess
instance. This should be unique. */
! sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%ld_%p.exe",
GetCurrentProcessId(), cp);
Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.222.2.2
retrieving revision 1.222.2.3
diff -C 2 -d -r1.222.2.2 -r1.222.2.3
*** SystemTools.cxx 24 Apr 2008 18:57:36 -0000 1.222.2.2
--- SystemTools.cxx 15 May 2008 19:40:00 -0000 1.222.2.3
***************
*** 3126,3132 ****
{
#if defined(_WIN32) && !defined(__CYGWIN__)
! if(const char* p = getenv("USERPROFILE"))
{
! homedir = p;
}
else
--- 3126,3132 ----
{
#if defined(_WIN32) && !defined(__CYGWIN__)
! if(const char* userp = getenv("USERPROFILE"))
{
! homedir = userp;
}
else
***************
*** 4280,4287 ****
res += " ";
! sprintf(buffer, "%d", osvi.dwMajorVersion);
res += buffer;
res += ".";
! sprintf(buffer, "%d", osvi.dwMinorVersion);
res += buffer;
}
--- 4280,4287 ----
res += " ";
! sprintf(buffer, "%ld", osvi.dwMajorVersion);
res += buffer;
res += ".";
! sprintf(buffer, "%ld", osvi.dwMinorVersion);
res += buffer;
}
***************
*** 4305,4309 ****
{
res += " Service Pack 6a (Build ";
! sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
--- 4305,4309 ----
{
res += " Service Pack 6a (Build ";
! sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
***************
*** 4314,4318 ****
res += osvi.szCSDVersion;
res += " (Build ";
! sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
--- 4314,4318 ----
res += osvi.szCSDVersion;
res += " (Build ";
! sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
***************
*** 4326,4330 ****
res += osvi.szCSDVersion;
res += " (Build ";
! sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
--- 4326,4330 ----
res += osvi.szCSDVersion;
res += " (Build ";
! sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
More information about the Cmake-commits
mailing list