[cmake-commits] alex committed cmMakefile.cxx 1.409 1.410

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefile.cxx 
Log Message:

ENH: UNIX, CYGWIN, WIN32, APPLE, QNXNTO and BEOS are not longer set in
cmMakefile.cxx, but now in the platform files and are now valid for the
target platform, not the host platform.
New variables CMAKE_HOST_WIN32, CMAKE_HOST_UNIX, CMAKE_HOST_APPLE and
CMAKE_HOST_CYGWIN have been added in cmMakefile.cxx (...and have now to be
used in all cmake files which are executed before
CMakeSystemSpecificInformation.cmake is loaded). For compatibility the old
set is set to the new one in CMakeDetermineSystem.cmake and reset before the
system platform files are loaded, so custom language or compiler modules
which use these should still work.

Alex


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -d -r1.409 -r1.410
--- cmMakefile.cxx	3 Aug 2007 19:44:25 -0000	1.409
+++ cmMakefile.cxx	9 Aug 2007 18:45:23 -0000	1.410
@@ -1912,23 +1912,16 @@
 void cmMakefile::AddDefaultDefinitions()
 {
 #if defined(_WIN32) || defined(__CYGWIN__)
-  this->AddDefinition("WIN32", "1");
+  this->AddDefinition("CMAKE_HOST_WIN32", "1");
 #else
-  this->AddDefinition("UNIX", "1");
+  this->AddDefinition("CMAKE_HOST_UNIX", "1");
 #endif
   // Cygwin is more like unix so enable the unix commands
 #if defined(__CYGWIN__)
-  this->AddDefinition("UNIX", "1");
-  this->AddDefinition("CYGWIN", "1");
+  this->AddDefinition("CMAKE_HOST_UNIX", "1");
 #endif
 #if defined(__APPLE__)
-  this->AddDefinition("APPLE", "1");
-#endif
-#if defined(__QNXNTO__)
-  this->AddDefinition("QNXNTO", "1");
-#endif
-#if defined(__BEOS__)
-  this->AddDefinition("BEOS", "1");
+  this->AddDefinition("CMAKE_HOST_APPLE", "1");
 #endif
 
   char temp[1024];