From 176fe63d151d60e90edd4bd01eaac7d1b74241cd Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 9 Aug 2007 14:45:23 -0400 Subject: 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 --- Modules/CMakeSystemSpecificInformation.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Modules/CMakeSystemSpecificInformation.cmake') diff --git a/Modules/CMakeSystemSpecificInformation.cmake b/Modules/CMakeSystemSpecificInformation.cmake index 37e31c9970..c0af01a4c5 100644 --- a/Modules/CMakeSystemSpecificInformation.cmake +++ b/Modules/CMakeSystemSpecificInformation.cmake @@ -3,6 +3,17 @@ # It is included after the compiler has been determined, so # we know things like the compiler name and if the compiler is gnu. +# before cmake 2.6 these variables were compiled-in in cmake +# now they are set in the Modules/${CMAKE_SYSTEM_NAME}.cmake file +# In order to keep custom language or compiler files working which might use +# these variables, they are set to the value of the compiled-in variables in +# CMakeDetermineSystem.cmake and reset here. +SET(APPLE ) +SET(UNIX ) +SET(CYGWIN ) +SET(WIN32 ) + + # include Generic system information INCLUDE(CMakeGenericSystem) -- cgit v1.2.1