diff --git a/modules/FindHeadersAndLibs.cmake b/modules/FindHeadersAndLibs.cmake
index d0919dcb001d66f04f9691f7a826037c7cec2e88..992b9fb58b2cd94cc9822027b5dcf5753d30da0a 100644
--- a/modules/FindHeadersAndLibs.cmake
+++ b/modules/FindHeadersAndLibs.cmake
@@ -59,7 +59,6 @@ function(FindHeader _libname _header_to_find)
     string(REPLACE ":" ";" _path_env "$ENV{INCLUDE_PATH}")
     list(APPEND _inc_env "${_path_env}")
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
diff --git a/modules/FindPkgconfigLibrariesAbsolutePath.cmake b/modules/FindPkgconfigLibrariesAbsolutePath.cmake
index 88999e421e2ad3ca04a0d84b70834cf040a63d28..8001353c8798d0ce974c2a57a563ab026cd2c48c 100644
--- a/modules/FindPkgconfigLibrariesAbsolutePath.cmake
+++ b/modules/FindPkgconfigLibrariesAbsolutePath.cmake
@@ -32,7 +32,6 @@ macro(FIND_PKGCONFIG_LIBRARIES_ABSOLUTE_PATH _prefix)
   else()
     string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
   endif()
-  list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
   list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   # non static case
   set(${_prefix}_LIBRARIES_COPY "${${_prefix}_LIBRARIES}")
diff --git a/modules/LibrariesAbsolutePath.cmake b/modules/LibrariesAbsolutePath.cmake
index 9a9c9a00ae399d9677fca6fbe97db112e07761c7..eb59c112c729a24e7119b78beeb0db7b682dd3db 100644
--- a/modules/LibrariesAbsolutePath.cmake
+++ b/modules/LibrariesAbsolutePath.cmake
@@ -32,7 +32,6 @@ macro(LIBRARIES_ABSOLUTE_PATH lib_list hints_paths)
   else()
     string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
   endif()
-  list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
   list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   # copy the lib list 
   set (${lib_list}_COPY "${${lib_list}}")
diff --git a/modules/PrintFindStatus.cmake b/modules/PrintFindStatus.cmake
index 54e33a7d7f1718bde020cb05eff833f97cefa035..1fdd403b7de11a8b946b178c5aada2da5e6fe33e 100644
--- a/modules/PrintFindStatus.cmake
+++ b/modules/PrintFindStatus.cmake
@@ -79,8 +79,7 @@ macro(Print_Find_Header_Status _libname _header_to_find)
 	"Nor ${LIBNAME}_DIR neither ${LIBNAME}_INCDIR"
 	"are defined so that we looked for ${_header_to_find} in"
 	"system paths (INCLUDE, CPATH, C_INCLUDE_PATH,"
-	"INCLUDE_PATH, CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES"
-	", CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES)${ColourReset}")
+	"INCLUDE_PATH, CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES)${ColourReset}")
       if(_inc_env)
 	message("${Blue}${_header_to_find} has not been found in"
 	  "${_inc_env}${ColourReset}")
@@ -119,7 +118,6 @@ macro(Print_Find_Library_Status _libname _lib_to_find)
 	"are defined so that we looked for ${_lib_to_find} in"
 	"system paths (Linux: LD_LIBRARY_PATH, Windows: LIB,"
 	"Mac: DYLD_LIBRARY_PATH,"
-	"CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES,"
 	"CMAKE_C_IMPLICIT_LINK_DIRECTORIES)${ColourReset}")
       if(_lib_env)
 	message("${Yellow}${_lib_to_find} has not been found in"
@@ -157,7 +155,6 @@ macro(Print_Find_Library_Blas_Status _libname _lib_to_find)
 	"are defined so that we look for ${_lib_to_find} in"
 	"system paths (Linux: LD_LIBRARY_PATH, Windows: LIB,"
 	"Mac: DYLD_LIBRARY_PATH,"
-	"CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES,"
 	"CMAKE_C_IMPLICIT_LINK_DIRECTORIES)${ColourReset}")
       if(_lib_env)
 	message("${Yellow}${_lib_to_find} has not been found in"
diff --git a/modules/find/FindBLAS.cmake b/modules/find/FindBLAS.cmake
index 02c7027e8c6fb4f99eb74090fec9b3724d855b02..8823e871c68e1754676d59c0ea65f2dc00a99ffc 100644
--- a/modules/find/FindBLAS.cmake
+++ b/modules/find/FindBLAS.cmake
@@ -82,7 +82,6 @@
 #     2) we look in environment variable BLAS_LIBDIR or BLAS_DIR (we guess the libdirs) if defined
 #     3) we look in common environnment variables depending on the system (INCLUDE, C_INCLUDE_PATH, CPATH - LIB, DYLD_LIBRARY_PATH, LD_LIBRARY_PATH)
 #     4) we look in common system paths depending on the system, see for example paths contained in the following cmake variables:
-#       - CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES, CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 #       - CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES, CMAKE_C_IMPLICIT_LINK_DIRECTORIES
 #
 
@@ -122,7 +121,6 @@ macro(Print_Find_Library_Blas_Status _libname _lib_to_find)
         "are defined so that we look for ${_lib_to_find} in"
         "system paths (Linux: LD_LIBRARY_PATH, Windows: LIB,"
         "Mac: DYLD_LIBRARY_PATH,"
-        "CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES,"
         "CMAKE_C_IMPLICIT_LINK_DIRECTORIES)${ColourReset}")
       if(_lib_env)
         message("${Yellow}${_lib_to_find} has not been found in"
@@ -249,7 +247,6 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)
         string(REPLACE ":" ";" _libdir2 "$ENV{LD_LIBRARY_PATH}")
       endif ()
       list(APPEND _libdir "${_libdir2}")
-      list(APPEND _libdir "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif ()
@@ -479,7 +476,6 @@ if( (NOT BLAS_FOUND_WITH_PKGCONFIG) OR BLAS_GIVEN_BY_USER )
           list(APPEND _inc_env "${_path_env}")
         endif()
       endif()
-      list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
       list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
       list(REMOVE_DUPLICATES _inc_env)
 
@@ -528,7 +524,6 @@ if( (NOT BLAS_FOUND_WITH_PKGCONFIG) OR BLAS_GIVEN_BY_USER )
       else ()
         string(REPLACE ":" ";" _libdir "$ENV{LD_LIBRARY_PATH}")
       endif ()
-      list(APPEND _libdir "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
       # libiomp5
       # --------
diff --git a/modules/find/FindBLASEXT.cmake b/modules/find/FindBLASEXT.cmake
index 5842225eb3679e6f750886d37d7afd59b82517a6..4e42fd011839fccb4a29e530305f7a19eb765e00 100644
--- a/modules/find/FindBLASEXT.cmake
+++ b/modules/find/FindBLASEXT.cmake
@@ -148,7 +148,6 @@ if(BLA_VENDOR MATCHES "Intel*")
     string(REPLACE ":" ";" _path_env "$ENV{INCLUDE_PATH}")
     list(APPEND _inc_env "${_path_env}")
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   set(ENV_MKLROOT "$ENV{MKLROOT}")
   if (ENV_MKLROOT)
diff --git a/modules/find/FindCBLAS.cmake b/modules/find/FindCBLAS.cmake
index 9dc87378f2f6f15e262bb0e3df7f015a575d0eb8..feec87fba419aa4fbe0b1696414224f53423e925 100644
--- a/modules/find/FindCBLAS.cmake
+++ b/modules/find/FindCBLAS.cmake
@@ -71,7 +71,6 @@
 #     2) we look in environment variable CBLAS_LIBDIR or CBLAS_DIR (we guess the libdirs) if defined
 #     3) we look in common environnment variables depending on the system (INCLUDE, C_INCLUDE_PATH, CPATH - LIB, DYLD_LIBRARY_PATH, LD_LIBRARY_PATH)
 #     4) we look in common system paths depending on the system, see for example paths contained in the following cmake variables:
-#       - CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES, CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 #       - CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES, CMAKE_C_IMPLICIT_LINK_DIRECTORIES
 #
 
@@ -235,7 +234,6 @@ if (BLAS_FOUND)
           list(APPEND _inc_env "${_path_env}")
         endif()
       endif()
-      list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
       list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
       list(REMOVE_DUPLICATES _inc_env)
 
@@ -298,7 +296,6 @@ if (BLAS_FOUND)
           else()
             string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
           endif()
-          list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
           list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
         endif()
       endif()
diff --git a/modules/find/FindCHAMELEON.cmake b/modules/find/FindCHAMELEON.cmake
index 627c6ca3c345a2234cc40ed91965554ca61f8969..71b8baf8ecc60ff037843b538e45c7d06e4bede0 100644
--- a/modules/find/FindCHAMELEON.cmake
+++ b/modules/find/FindCHAMELEON.cmake
@@ -403,7 +403,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUN
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -466,7 +465,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT CHAMELEON_FOUN
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindCPPCHECK.cmake b/modules/find/FindCPPCHECK.cmake
index 0a97a8bb7afd190305e200bc46e00a0cceb94fe6..8793631677b4a938c51223c346aed8a53b927fc2 100644
--- a/modules/find/FindCPPCHECK.cmake
+++ b/modules/find/FindCPPCHECK.cmake
@@ -59,7 +59,6 @@ else()
   string(REPLACE ":" ";" _path_env "$ENV{PATH}")
   list(APPEND where_to_look "${_path_env}")
 endif()
-list(APPEND where_to_look "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND where_to_look "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES where_to_look)
 
diff --git a/modules/find/FindEZTRACE.cmake b/modules/find/FindEZTRACE.cmake
index 698c3314846c007b79989f41ebf6663679639206..e85b543b2a8890c04e947ddba5f929d35f785dc4 100644
--- a/modules/find/FindEZTRACE.cmake
+++ b/modules/find/FindEZTRACE.cmake
@@ -124,7 +124,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT EZTRACE_FOUND)
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
   list(REMOVE_DUPLICATES _lib_env)
@@ -174,7 +173,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT EZTRACE_FOUND)
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -242,7 +240,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT EZTRACE_FOUND)
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindFABULOUS.cmake b/modules/find/FindFABULOUS.cmake
index 485232de77e953f445091f45229cd4dad5bc2878..265d4f8b4355a0141c6fe2fe27a290e6330cef69 100644
--- a/modules/find/FindFABULOUS.cmake
+++ b/modules/find/FindFABULOUS.cmake
@@ -160,7 +160,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT FABULOUS_FOUND
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -247,7 +246,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT FABULOUS_FOUND
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindFFTW.cmake b/modules/find/FindFFTW.cmake
index fe34e2f5463773aa7f3a4c86bee0b834548e6369..9f2e6ee768012872dad225ed7a110bca17791199 100644
--- a/modules/find/FindFFTW.cmake
+++ b/modules/find/FindFFTW.cmake
@@ -422,7 +422,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -511,7 +510,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
         string(REPLACE ":" ";" _lib_env2 "$ENV{LD_LIBRARY_PATH}")
       endif()
       list(APPEND _lib_env "${_lib_env2}")
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindFXT.cmake b/modules/find/FindFXT.cmake
index 071e95fb2b8a010ce42004865b33b5e237b290ba..1e9ebd26118042b693592e00922e9f9ddd179313 100644
--- a/modules/find/FindFXT.cmake
+++ b/modules/find/FindFXT.cmake
@@ -135,7 +135,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT FXT_FOUND) OR
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -201,7 +200,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT FXT_FOUND) OR
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindGTG.cmake b/modules/find/FindGTG.cmake
index 4c3fc6a5c79136ef95968548e3d0cf9cb8b2f79e..673bf7d4be1607e750eefd106b39584bb82007d0 100644
--- a/modules/find/FindGTG.cmake
+++ b/modules/find/FindGTG.cmake
@@ -135,7 +135,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT GTG_FOUND) OR
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -201,7 +200,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT GTG_FOUND) OR
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindHQR.cmake b/modules/find/FindHQR.cmake
index 5136432e5338e22dd3951c79c28966d948c8ce15..e69c9a45888cf1106efa57e84968281d7e824923 100644
--- a/modules/find/FindHQR.cmake
+++ b/modules/find/FindHQR.cmake
@@ -132,7 +132,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -196,7 +195,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HQR_FOUND) OR
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindHWLOC.cmake b/modules/find/FindHWLOC.cmake
index ff6afd1e8d90a9f79a67a0f07f748f129b209760..fa53d6b8e47a68e7dc8e801aa28096fde228027d 100644
--- a/modules/find/FindHWLOC.cmake
+++ b/modules/find/FindHWLOC.cmake
@@ -136,7 +136,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) O
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -204,7 +203,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) O
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindHYPRE.cmake b/modules/find/FindHYPRE.cmake
index 8823f6a1b6f993dc699f884885ec174083814bea..275ef4dafccc3cb9f2fdd08f38f6f70cef03e762 100644
--- a/modules/find/FindHYPRE.cmake
+++ b/modules/find/FindHYPRE.cmake
@@ -86,7 +86,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -154,7 +153,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindLAPACK.cmake b/modules/find/FindLAPACK.cmake
index 7b7756c5200a65d28cf0bb96269f0fc68f46913c..b0bce5d9ee8c93cfd72108b0cebbec74dae3d0a4 100644
--- a/modules/find/FindLAPACK.cmake
+++ b/modules/find/FindLAPACK.cmake
@@ -100,7 +100,6 @@ macro(Print_Find_Library_Blas_Status _libname _lib_to_find)
         "are defined so that we look for ${_lib_to_find} in"
         "system paths (Linux: LD_LIBRARY_PATH, Windows: LIB,"
         "Mac: DYLD_LIBRARY_PATH,"
-        "CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES,"
         "CMAKE_C_IMPLICIT_LINK_DIRECTORIES)${ColourReset}")
       if(_lib_env)
         message("${Yellow}${_lib_to_find} has not been found in"
@@ -232,7 +231,6 @@ macro(Check_Lapack_Libraries LIBRARIES _prefix _name _flags _list _blas _threads
         string(REPLACE ":" ";" _libdir2 "$ENV{LD_LIBRARY_PATH}")
       endif ()
       list(APPEND _libdir "${_libdir2}")
-      list(APPEND _libdir "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif ()
   endif ()
diff --git a/modules/find/FindLAPACKE.cmake b/modules/find/FindLAPACKE.cmake
index 02c6a943196906473022919e2933eeb4de912cfe..1f334b357d3e2d4cf0192e0e2c1d842cab3372cc 100644
--- a/modules/find/FindLAPACKE.cmake
+++ b/modules/find/FindLAPACKE.cmake
@@ -222,7 +222,6 @@ if (LAPACK_FOUND)
           list(APPEND _inc_env "${_path_env}")
         endif()
       endif()
-      list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
       list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
       list(REMOVE_DUPLICATES _inc_env)
 
@@ -284,7 +283,6 @@ if (LAPACK_FOUND)
           else()
             string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
           endif()
-          list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
           list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
         endif()
       endif()
diff --git a/modules/find/FindLAPACKEXT.cmake b/modules/find/FindLAPACKEXT.cmake
index 289155e19b5ae3055d3993de75ced2a8bece3c51..9baf24e24745d58bcb4b0bd7acd22fb448f1c9b7 100644
--- a/modules/find/FindLAPACKEXT.cmake
+++ b/modules/find/FindLAPACKEXT.cmake
@@ -93,7 +93,6 @@ if(BLA_VENDOR MATCHES "Intel*")
     string(REPLACE ":" ";" _path_env "$ENV{INCLUDE_PATH}")
     list(APPEND _inc_env "${_path_env}")
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   set(ENV_MKLROOT "$ENV{MKLROOT}")
   if (ENV_MKLROOT)
diff --git a/modules/find/FindMAGMA.cmake b/modules/find/FindMAGMA.cmake
index 5bd013fe647d5f64cd4738984e4ed73de9bf8eb1..057d566f38ad110fb1c184f72f15f9f5341e3891 100644
--- a/modules/find/FindMAGMA.cmake
+++ b/modules/find/FindMAGMA.cmake
@@ -201,7 +201,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT MAGMA_FOUND) O
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -263,7 +262,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT MAGMA_FOUND) O
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindMETIS.cmake b/modules/find/FindMETIS.cmake
index 446b973f2aac9ed085435b1f83a42e2cf9898cc1..9ce9ca6b62fc00397b4f132c401c9b8b44c9c0a0 100644
--- a/modules/find/FindMETIS.cmake
+++ b/modules/find/FindMETIS.cmake
@@ -82,7 +82,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -145,7 +144,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindMUMPS.cmake b/modules/find/FindMUMPS.cmake
index d61339fe832f92c89c9e04c52a251e4c2367e95d..b1e9be54ebcaf7840fffd15d6f032a9c682846e4 100644
--- a/modules/find/FindMUMPS.cmake
+++ b/modules/find/FindMUMPS.cmake
@@ -293,7 +293,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -315,7 +314,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindPAMPA.cmake b/modules/find/FindPAMPA.cmake
index 4a04983fe05f967e3e30df355dfbaf53fd1573dc..fba85f8a55e1675d4365ba9a58bd81ba67500861 100644
--- a/modules/find/FindPAMPA.cmake
+++ b/modules/find/FindPAMPA.cmake
@@ -107,7 +107,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -182,7 +181,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindPAPI.cmake b/modules/find/FindPAPI.cmake
index 35a5fd82661e18ede504038af1be1614fc24d442..add232d24be3ca9956005970e61d9bd84cb40982 100644
--- a/modules/find/FindPAPI.cmake
+++ b/modules/find/FindPAPI.cmake
@@ -135,7 +135,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PAPI_FOUND) OR
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -201,7 +200,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PAPI_FOUND) OR
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindPARMETIS.cmake b/modules/find/FindPARMETIS.cmake
index 79a67ad187f3d6d6cc5055e0fe7279b41320ecf3..8033659291f55d8d60e87c69bf4f27b502f38722 100644
--- a/modules/find/FindPARMETIS.cmake
+++ b/modules/find/FindPARMETIS.cmake
@@ -106,7 +106,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -169,7 +168,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindPARSEC.cmake b/modules/find/FindPARSEC.cmake
index 8f7408041c32d3d6121382fd44a451df0bd55ff5..9aa344b268873233510c6130878b15e5f272be46 100644
--- a/modules/find/FindPARSEC.cmake
+++ b/modules/find/FindPARSEC.cmake
@@ -308,7 +308,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PARSEC_FOUND)
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -390,7 +389,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PARSEC_FOUND)
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindPASTIX.cmake b/modules/find/FindPASTIX.cmake
index 7d7290f405a759eb538aa9b7fa982746567635d0..06d46047ed9f590b280bc3f70a5c4bcd3cd2c231 100644
--- a/modules/find/FindPASTIX.cmake
+++ b/modules/find/FindPASTIX.cmake
@@ -448,7 +448,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PASTIX_FOUND)
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -511,7 +510,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT PASTIX_FOUND)
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindPTSCOTCH.cmake b/modules/find/FindPTSCOTCH.cmake
index b2fdb9ec0da8f1308da8be550db16529d8b1c9e1..bc10873f3c0acd74cbff7319522ee96ada8a3c5e 100644
--- a/modules/find/FindPTSCOTCH.cmake
+++ b/modules/find/FindPTSCOTCH.cmake
@@ -126,7 +126,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -202,7 +201,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindQUARK.cmake b/modules/find/FindQUARK.cmake
index 8361e018ac5f080b6c3aefd7fef63a4356f36886..6431029e990d9189cb13b2003bfec823e04c66b0 100644
--- a/modules/find/FindQUARK.cmake
+++ b/modules/find/FindQUARK.cmake
@@ -130,7 +130,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -192,7 +191,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindSCALAPACK.cmake b/modules/find/FindSCALAPACK.cmake
index c1f34aaeeb75ba425d7a53a207ad5cdf9119a6c0..9d0514d607219a1117cd2ac05c7d013fbb4ab641 100644
--- a/modules/find/FindSCALAPACK.cmake
+++ b/modules/find/FindSCALAPACK.cmake
@@ -82,7 +82,6 @@ macro(Print_Find_Library_Blas_Status _libname _lib_to_find)
         "are defined so that we look for ${_lib_to_find} in"
         "system paths (Linux: LD_LIBRARY_PATH, Windows: LIB,"
         "Mac: DYLD_LIBRARY_PATH,"
-        "CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES,"
         "CMAKE_C_IMPLICIT_LINK_DIRECTORIES)${ColourReset}")
       if(_lib_env)
         message("${Yellow}${_lib_to_find} has not been found in"
@@ -214,7 +213,6 @@ macro(Check_Scalapack_Libraries LIBRARIES _prefix _name _flags _list _blaslapack
         string(REPLACE ":" ";" _libdir2 "$ENV{LD_LIBRARY_PATH}")
       endif ()
       list(APPEND _libdir "${_libdir2}")
-      list(APPEND _libdir "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif ()
   endif ()
diff --git a/modules/find/FindSCOTCH.cmake b/modules/find/FindSCOTCH.cmake
index ea21164a2a04519c8afb433c2d2ab51f7f3040c4..f86f03855e65240f543ef6c45f8f441f82aba515 100644
--- a/modules/find/FindSCOTCH.cmake
+++ b/modules/find/FindSCOTCH.cmake
@@ -108,7 +108,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -171,7 +170,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindSIMGRID.cmake b/modules/find/FindSIMGRID.cmake
index d4d175d704c307be0127eaa8aa14ac1812d4e66b..53789647d2705f7af2610915e4171230b8eaa0ea 100644
--- a/modules/find/FindSIMGRID.cmake
+++ b/modules/find/FindSIMGRID.cmake
@@ -135,7 +135,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT SIMGRID_FOUND)
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -211,7 +210,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT SIMGRID_FOUND)
       else()
         string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
       endif()
-      list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
       list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
     endif()
   endif()
diff --git a/modules/find/FindSTARPU.cmake b/modules/find/FindSTARPU.cmake
index 31c89bac25ddf890c291d70760c7eb14e2623f8a..90d3837eb59d362d60b0e1790f814510f7013b50 100644
--- a/modules/find/FindSTARPU.cmake
+++ b/modules/find/FindSTARPU.cmake
@@ -329,7 +329,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND)
       list(APPEND _inc_env "${_path_env}")
     endif()
   endif()
-  list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
   list(REMOVE_DUPLICATES _inc_env)
 
@@ -550,7 +549,6 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT STARPU_FOUND)
         else()
           string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
         endif()
-        list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
         list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
       endif()
     endif()
diff --git a/modules/find/FindSUITESPARSE.cmake b/modules/find/FindSUITESPARSE.cmake
index 7c7881c2b1c8e5e4c3dd2f23d08aaf13d1fec86f..8a9eff8e2d49503cd13598007fe0d2fef11b6d0a 100644
--- a/modules/find/FindSUITESPARSE.cmake
+++ b/modules/find/FindSUITESPARSE.cmake
@@ -123,7 +123,6 @@ else()
     list(APPEND _inc_env "${_path_env}")
   endif()
 endif()
-list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
 list(REMOVE_DUPLICATES _inc_env)
 
@@ -145,7 +144,6 @@ else()
     else()
       string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
     endif()
-    list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
     list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
   endif()
 endif()
diff --git a/modules/find/FindTMG.cmake b/modules/find/FindTMG.cmake
index d38b7f08741096ecc43141d832ba9899b02590de..5721dab29815597b771b78342647a5e38a14f7d4 100644
--- a/modules/find/FindTMG.cmake
+++ b/modules/find/FindTMG.cmake
@@ -140,7 +140,6 @@ if (LAPACK_FOUND)
         else()
           string(REPLACE ":" ";" _lib_env "$ENV{LD_LIBRARY_PATH}")
         endif()
-        list(APPEND _lib_env "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}")
         list(APPEND _lib_env "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
       endif()
     endif()
diff --git a/modules/find/morse_cmakefind_doc.html b/modules/find/morse_cmakefind_doc.html
index 075e085367e9e8f304b6bf9ab63acfcaf119229b..2ce19ccb86e33b652872ac4a1916cf9f6f622b42 100644
--- a/modules/find/morse_cmakefind_doc.html
+++ b/modules/find/morse_cmakefind_doc.html
@@ -166,8 +166,7 @@ environment (cf. PKG_CONFIG_PATH environment variable) and is used
 <code>INCLUDE</code>, <code>C_INCLUDE_PATH</code>, <code>CPATH</code>, <code>INCLUDE_PATH</code>
 </li>
 <li>scan the system paths for headers: look into path present in
-the CMake variables
-<code>CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES</code> and
+the CMake variable
 <code>CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES</code>
 </li>
 </ul>
@@ -178,8 +177,7 @@ the CMake variables
 <code>LIB</code> (Windows), <code>DYLD_LIBRARY_PATH</code> (Mac OS X), <code>LD_LIBRARY_PATH</code> (Linux)
 </li>
 <li>scan the system paths for headers: look into path present in
-the CMake variables
-<code>CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES</code>,
+the CMake variable
 <code>CMAKE_C_IMPLICIT_LINK_DIRECTORIES</code>
 </li>
 </ul>
diff --git a/modules/find/morse_cmakefind_doc.org b/modules/find/morse_cmakefind_doc.org
index 4d1110455317b0784a4006b4eb91bffab9789b1f..b3916353516b5104d60130fde028e215b78591e0 100644
--- a/modules/find/morse_cmakefind_doc.org
+++ b/modules/find/morse_cmakefind_doc.org
@@ -68,16 +68,12 @@ etc, sub-directories). The priority order is the following:
       - scan the paths present in the following environment variables
         ~INCLUDE~, ~C_INCLUDE_PATH~, ~CPATH~, ~INCLUDE_PATH~
       - scan the system paths for headers: look into path present in
-        the CMake variables
-        ~CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES~ and
-        ~CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES~
+        the CMake variable ~CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES~
    b) for libraries:
       - scan the paths present in the following environment variables
         ~LIB~ (Windows), ~DYLD_LIBRARY_PATH~ (Mac OS X), ~LD_LIBRARY_PATH~ (Linux)
       - scan the system paths for headers: look into path present in
-        the CMake variables
-        ~CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES~,
-        ~CMAKE_C_IMPLICIT_LINK_DIRECTORIES~
+        the CMake variable ~CMAKE_C_IMPLICIT_LINK_DIRECTORIES~
 
 When it is possible, compiler flags are also given to users. This last
 point suggest that the information can be found in the library