diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 19:06:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 19:06:32 (GMT) |
| commit | 9f4605149072346aa59c1188d0582bc1c971fe7a (patch) | |
| tree | 93d8462ce6637e1ed9bdeed4557ebfaa4487f7d8 /Source | |
| parent | bc92c842317ea89e0785ed221adf28aa54319232 (diff) | |
| parent | 85c0a69a92e78275ea0b180482bafcdb877b0dc3 (diff) | |
| download | CMake-9f4605149072346aa59c1188d0582bc1c971fe7a.zip CMake-9f4605149072346aa59c1188d0582bc1c971fe7a.tar.gz CMake-9f4605149072346aa59c1188d0582bc1c971fe7a.tar.bz2 | |
Merge topic 'cygwin'
85c0a69 Cygwin: Do not define 'WIN32' (#10122)
62c6d2d Merge branch 'cmake_--system-information_min-version' into cygwin
72db20f Merge branch 'tests-if-CYGWIN' into cygwin
5adef16 Merge branch 'cygwin-module-prefix' into cygwin
cbc3258 Merge branch 'try-compile-min-version' into cygwin
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index cf03b80..e61e157 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2341,17 +2341,19 @@ void cmMakefile::AddDefaultDefinitions() working, these variables are still also set here in this place, but they will be reset in CMakeSystemSpecificInformation.cmake before the platform files are executed. */ -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) 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("CMAKE_HOST_UNIX", "1"); + if(cmSystemTools::IsOn(cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32"))) + { + this->AddDefinition("WIN32", "1"); + this->AddDefinition("CMAKE_HOST_WIN32", "1"); + } #endif #if defined(__APPLE__) this->AddDefinition("APPLE", "1"); |