Merge branch 'update_finders' into 'master'

Update IPOPT related finders

See merge request !167

cmake/FindIPOPT.cmake

@@ -87,8 +87,8 @@ if (WIN32)
 
 ELSE( WIN32 )
    find_path(IPOPT_INCLUDE_DIR NAMES IpNLP.hpp
-     PATHS  "$ENV{IPOPT_HOME}/include/coin"
-            "/usr/include/coin"
+     HINTS  "$ENV{IPOPT_HOME}/include/coin"
+     PATHS  "/usr/include/coin"
             "~/sw/Ipopt-3.12.4-installed/include/coin"
    )
 

cmake/FindMETIS.cmake

@@ -36,30 +36,31 @@ endif()
 
 
 find_path(METIS_INCLUDE_DIR NAMES metis.h
-     PATHS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
-           "/usr/include/"
+     HINTS "$ENV{IPOPT_HOME}/ThirdParty/Metis/metis-4.0/Lib/"
+           "$ENV{IPOPT_HOME}/include/coin/ThirdParty/"
+     PATHS "/usr/include/"
            "/usr/include/metis"
            "/opt/local/include"
            "/opt/local/include/metis"
-		   "${VS_SEARCH_PATH}Ipopt-3.12.9/include/metis"
+           "${VS_SEARCH_PATH}Ipopt-3.12.9/include/metis"
            "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/metis"
    )
    
 find_library( METIS_LIBRARY_RELEASE
-              metis coinmetis
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
+              coinmetis metis
+              HINTS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
                     "/opt/local/lib"
-					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
+                    "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )
                     
 find_library( METIS_LIBRARY_DEBUG
-              metisd coinmetisd
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
+              coinmetisd metisd
+              HINTS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
                     "/opt/local/lib" 
-					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
+                    "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )      
                     

cmake/FindMUMPS.cmake

@@ -35,24 +35,25 @@ elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
 endif()
 
 find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h
-     PATHS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
-           "/usr/include/"
-		   "${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps"
+     HINTS "$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
+           "$ENV{IPOPT_HOME}/include/coin/ThirdParty"
+     PATHS "/usr/include/"
+           "${VS_SEARCH_PATH}Ipopt-3.12.9/include/mumps"
            "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps"
    )
    
 find_library( MUMPS_LIBRARY_DEBUG
-              dmumpsd coinmumpsd coinmumpscd
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
-					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
+              coinmumpsd dmumpsd coinmumpscd
+              HITNS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
+                    "${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )
                     
 find_library( MUMPS_LIBRARY_RELEASE
-              dmumps coinmumps coinmumpsc
-              PATHS "$ENV{IPOPT_HOME}/lib/"
-                    "/usr/lib"
+              coinmumps dmumps coinmumpsc
+              HINTS "$ENV{IPOPT_HOME}/lib/"
+              PATHS "/usr/lib"
 					"${VS_SEARCH_PATH}Ipopt-3.12.9/lib"
                     "${VS_SEARCH_PATH}Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
                     )