[cmake-commits] hoffman committed CMakeLists.txt 1.134 1.135 SystemInformation.hxx.in 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 30 11:17:39 EST 2008


Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv9459/Source/kwsys

Modified Files:
	CMakeLists.txt SystemInformation.hxx.in 
Log Message:
ENH: enhancements for cdash, include system information and better time entries


Index: SystemInformation.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.hxx.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SystemInformation.hxx.in	8 Jan 2008 22:51:05 -0000	1.3
+++ SystemInformation.hxx.in	30 Jan 2008 16:17:36 -0000	1.4
@@ -107,6 +107,11 @@
 //# error "No Long long"
 #endif
 
+/* Define these macros temporarily to keep the code readable.  */
+#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
+# define kwsys_stl @KWSYS_NAMESPACE at _stl
+# define kwsys_ios @KWSYS_NAMESPACE at _ios
+#endif
 
 #include <@KWSYS_NAMESPACE@/stl/string>
 #include <@KWSYS_NAMESPACE@/stl/vector>
@@ -294,4 +299,11 @@
   std::string OSPlatform; 
 };
 } // namespace @KWSYS_NAMESPACE@
+
+/* Undefine temporary macros.  */
+#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE at _NAME_IS_KWSYS
+# undef kwsys_stl
+# undef kwsys_ios
+#endif
+
 #endif

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- CMakeLists.txt	8 Jan 2008 21:28:46 -0000	1.134
+++ CMakeLists.txt	30 Jan 2008 16:17:36 -0000	1.135
@@ -137,9 +137,9 @@
   SET(KWSYS_USE_IOStream 1)
   SET(KWSYS_USE_DateStamp 1)
   SET(KWSYS_USE_String 1)
-#  SET(KWSYS_USE_SystemInformation 1)
+  SET(KWSYS_USE_SystemInformation 1)
 ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
-
+  
 # Setup the large file support default.
 IF(KWSYS_LFS_DISABLE)
   SET(KWSYS_LFS_REQUESTED 0)



More information about the Cmake-commits mailing list