Bläddra i källkod

Fix compile flags on c files in static liobraries on windows

Andy Cedilnik 23 år sedan
förälder
incheckning
4b0c9ee2be
1 ändrade filer med 7 tillägg och 9 borttagningar
  1. 7 9
      Source/cmLocalUnixMakefileGenerator.cxx

+ 7 - 9
Source/cmLocalUnixMakefileGenerator.cxx

@@ -2206,19 +2206,17 @@ OutputBuildObjectFromSource(std::ostream& fout,
       rules.push_back(m_Makefile->GetDefinition("CMAKE_C_COMPILE_OBJECT"));
       flags += this->GetSafeDefinition("CMAKE_C_FLAGS");
       flags += " ";
+      if(buildType.size())
+        {
+        std::string build = "CMAKE_C_FLAGS_";
+        build += buildType;
+        flags +=  this->GetSafeDefinition(build.c_str());
+        flags += " ";
+        }
       if(shared)
         {
         flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_C_FLAGS");
         flags += " ";
-        flags += this->GetSafeDefinition("CMAKE_C_FLAGS");
-        flags += " ";
-        if(buildType.size())
-          {
-          std::string build = "CMAKE_C_FLAGS_";
-          build += buildType;
-          flags +=  this->GetSafeDefinition(build.c_str());
-          flags += " ";
-          }
         }
       break;
       }