[cmake-commits] alex committed cmGlobalGenerator.cxx 1.188 1.189

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx 
Log Message:

ENH: check for CMAKE_HOST_SYSTEM_NAME to decide whether to load
CMakeDetermineSystem.cmake, since CMAKE_SYSTEM_NAME might already be preset
when using cmake for cross compiling
use type STRING instead of FILEPATH since otherwise a strange filename was
generated

Alex


Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- cmGlobalGenerator.cxx	19 Jun 2007 17:10:21 -0000	1.188
+++ cmGlobalGenerator.cxx	26 Jun 2007 17:00:42 -0000	1.189
@@ -160,7 +160,7 @@
 //
 // CMakeSystem.cmake - configured file created by CMakeDetermineSystem.cmake
 //   CMakeDetermineSystem.cmake - figure out os info and create
-//                                CMakeSystem.cmake IFF CMAKE_SYSTEM_NAME
+//                                CMakeSystem.cmake IF CMAKE_HOST_SYSTEM_NAME
 //                                not set
 //   CMakeSystem.cmake - configured file created by
 //                       CMakeDetermineSystem.cmake IFF CMAKE_SYSTEM_LOADED
@@ -243,7 +243,7 @@
     }
   //  Load the CMakeDetermineSystem.cmake file and find out
   // what platform we are running on
-  if (!mf->GetDefinition("CMAKE_SYSTEM_NAME"))
+  if (!mf->GetDefinition("CMAKE_HOST_SYSTEM_NAME"))
     {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     /* Windows version number data.  */