diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-12-22 20:26:30 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-12-23 22:04:49 (GMT) |
| commit | b2f308c8f9b4ded77f0693b39c0288e3bbb00977 (patch) | |
| tree | 17147169f0687131605f82690ca28ab678d2b2cb /Source | |
| parent | 8c7b19d35ee81afac57fe623217578191f4d034c (diff) | |
| download | CMake-b2f308c8f9b4ded77f0693b39c0288e3bbb00977.zip CMake-b2f308c8f9b4ded77f0693b39c0288e3bbb00977.tar.gz CMake-b2f308c8f9b4ded77f0693b39c0288e3bbb00977.tar.bz2 | |
Add support for windows resources with mingw/msys.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalMSYSMakefileGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmGlobalMinGWMakefileGenerator.cxx | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index d324e59..820e7e6 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -69,9 +69,16 @@ void cmGlobalMSYSMakefileGenerator { gxx = tgxx; } + std::string trc = cmSystemTools::FindProgram("windres", locations); + std::string rc = "windres.exe"; + if(trc.size()) + { + rc = trc; + } mf->AddDefinition("MSYS", "1"); mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str()); mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str()); + mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str()); this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); if(!mf->IsSet("CMAKE_AR") && diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx index 9f9d1be..2f558dc 100644 --- a/Source/cmGlobalMinGWMakefileGenerator.cxx +++ b/Source/cmGlobalMinGWMakefileGenerator.cxx @@ -44,8 +44,15 @@ void cmGlobalMinGWMakefileGenerator { gxx = tgxx; } + std::string trc = cmSystemTools::FindProgram("windres", locations); + std::string rc = "windres.exe"; + if(trc.size()) + { + rc = trc; + } mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str()); mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str()); + mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str()); this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } |