kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix problems with .def and RC files

Browse Source
This commit is contained in:
Bill Hoffman 2004-09-23 08:51:06 -04:00
parent 0eb9c01f14
commit 67ac3ea503
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeRCInformation.cmake
View File

@ -15,7 +15,7 @@ SET (CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS_ENV_INIT} $ENV{RCFLAGS} ${CMAKE_RC_FLAGS_I
# now define the following rule variables # now define the following rule variables
# CMAKE_RC_COMPILE_OBJECT # CMAKE_RC_COMPILE_OBJECT
SET(CMAKE_INCLUDE_FLAG_RC "-I")
# compile a Resource file into an object file # compile a Resource file into an object file
IF(NOT CMAKE_RC_COMPILE_OBJECT) IF(NOT CMAKE_RC_COMPILE_OBJECT)
SET(CMAKE_RC_COMPILE_OBJECT SET(CMAKE_RC_COMPILE_OBJECT

8
Source/cmGlobalGenerator.cxx
View File

@ -312,6 +312,10 @@ void cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
const char* cmGlobalGenerator::GetLanguageOutputExtensionForLanguage(const char* lang) const char* cmGlobalGenerator::GetLanguageOutputExtensionForLanguage(const char* lang)
{ {
if(!lang)
{
return "";
}
if(m_LanguageToOutputExtension.count(lang) > 0) if(m_LanguageToOutputExtension.count(lang) > 0)
{ {
return m_LanguageToOutputExtension[lang].c_str(); return m_LanguageToOutputExtension[lang].c_str();
@ -321,6 +325,10 @@ const char* cmGlobalGenerator::GetLanguageOutputExtensionForLanguage(const char*
const char* cmGlobalGenerator::GetLanguageOutputExtensionFromExtension(const char* ext) const char* cmGlobalGenerator::GetLanguageOutputExtensionFromExtension(const char* ext)
{ {
if(!ext)
{
return "";
}
const char* lang = this->GetLanguageFromExtension(ext); const char* lang = this->GetLanguageFromExtension(ext);
return this->GetLanguageOutputExtensionForLanguage(lang); return this->GetLanguageOutputExtensionForLanguage(lang);
} }