Browse Source

ENH: change framework order

Bill Hoffman 20 years ago
parent
commit
9e5c219b87
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Source/cmFindPathCommand.cxx
  2. 1 1
      Source/cmMakefile.cxx

+ 1 - 1
Source/cmFindPathCommand.cxx

@@ -149,8 +149,8 @@ cmStdString cmFindPathCommand::FindHeaderInFrameworks(
     }
     }
   path.push_back("~/Library/Frameworks");
   path.push_back("~/Library/Frameworks");
   path.push_back("/Library/Frameworks");
   path.push_back("/Library/Frameworks");
-  path.push_back("/System/Library/Frameworks");
   path.push_back("/Network/Library/Frameworks");
   path.push_back("/Network/Library/Frameworks");
+  path.push_back("/System/Library/Frameworks");
   for(  std::vector<std::string>::iterator i = path.begin();
   for(  std::vector<std::string>::iterator i = path.begin();
         i != path.end(); ++i)
         i != path.end(); ++i)
     {
     {

+ 1 - 1
Source/cmMakefile.cxx

@@ -2279,8 +2279,8 @@ std::string cmMakefile::FindLibrary(const char* name,
       {
       {
       path.push_back("~/Library/Frameworks");
       path.push_back("~/Library/Frameworks");
       path.push_back("/Library/Frameworks");
       path.push_back("/Library/Frameworks");
-      path.push_back("/System/Library/Frameworks");
       path.push_back("/Network/Library/Frameworks");
       path.push_back("/Network/Library/Frameworks");
+      path.push_back("/System/Library/Frameworks");
       }
       }
     }
     }
   if(m_LocalGenerator->GetGlobalGenerator()->GetLanguageEnabled("C"))
   if(m_LocalGenerator->GetGlobalGenerator()->GetLanguageEnabled("C"))