ENH: merge from main tree

2 files changed, 11 insertions, 9 deletions

diff --git a/Source/cmSetTargetPropertiesCommand.h b/Source/cmSetTargetPropertiesCommand.h
index 2cdc7de..91d320e 100644
--- a/Source/cmSetTargetPropertiesCommand.h
+++ b/Source/cmSetTargetPropertiesCommand.h
@@ -94,6 +94,11 @@ public:
         "to build sources within the target.  It may also be used to pass "
         "additional preprocessor definitions."
         "\n"
+        "The LINKER_LANGUAGE property is used to change the tool "
+        "used to link an executable or shared library. The default is "
+        "set the language to match the files in the library. CXX and C "
+        "are common values for this property."
+        "\n"
         "For shared libraries VERSION and SOVERSION can be used to specify "
         "the build version and api version respectively. When building or "
         "installing appropriate symlinks are created if the platform "
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index 1a878d5..4c9bbb4 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -2018,7 +2018,7 @@ kwsys_stl::string SystemTools::FindProgram(
     }
   kwsys_stl::string name = nameIn;
   kwsys_stl::vector<kwsys_stl::string> extensions;
-#if defined (_WIN32) || defined(__CYGWIN__) | defined(__MINGW32__)
+#if defined (_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
   bool hasExtension = false;
   // check to see if the name already has a .xxx at
   // the end of it
@@ -2034,8 +2034,8 @@ kwsys_stl::string SystemTools::FindProgram(
     }
 #endif
   kwsys_stl::string tryPath;
-  // first try the name as it was given (adding extensions
-  // if needed.)
+
+  // first try with extensions if the os supports them
   if(extensions.size())
     {
     for(kwsys_stl::vector<kwsys_stl::string>::iterator i = 
@@ -2050,15 +2050,13 @@ kwsys_stl::string SystemTools::FindProgram(
         }
       }
     }
-  else
-    {
+  // now try just the name
     tryPath = name;
     if(SystemTools::FileExists(tryPath.c_str()) &&
        !SystemTools::FileIsDirectory(tryPath.c_str()))
       {
       return SystemTools::CollapseFullPath(tryPath.c_str());
       }
-    }
   // now construct the path
   kwsys_stl::vector<kwsys_stl::string> path;
   // Add the system search path to our path.
@@ -2080,6 +2078,7 @@ kwsys_stl::string SystemTools::FindProgram(
     // Remove double quotes from the path on windows
     SystemTools::ReplaceString(*p, "\"", "");
 #endif
+    // first try with extensions
     if(extensions.size())
       {
       for(kwsys_stl::vector<kwsys_stl::string>::iterator ext 
@@ -2096,8 +2095,7 @@ kwsys_stl::string SystemTools::FindProgram(
           }
         }
       }
-    else
-      {
+    // now try it without them
       tryPath = *p;
       tryPath += "/";
       tryPath += name;
@@ -2105,7 +2103,6 @@ kwsys_stl::string SystemTools::FindProgram(
          !SystemTools::FileIsDirectory(tryPath.c_str()))
         {
         return SystemTools::CollapseFullPath(tryPath.c_str());
-        }
       }
     }
   // Couldn't find the program.