浏览代码

ENH: fix problems with .def and RC files

Bill Hoffman 21 年之前
父节点
当前提交
67ac3ea503
共有 2 个文件被更改,包括 9 次插入1 次删除
  1. 1 1
      Modules/CMakeRCInformation.cmake
  2. 8 0
      Source/cmGlobalGenerator.cxx

+ 1 - 1
Modules/CMakeRCInformation.cmake

@@ -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 - 0
Source/cmGlobalGenerator.cxx

@@ -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);
 }
 }