diff --git a/CMake/FindGettextLib.cmake b/CMake/FindGettextLib.cmake
index 8685bc2ea92e6f7c90a6984b14353154d477ef23..62ba43e5d635060e5dc65de82363b102da0bb7ed 100644
--- a/CMake/FindGettextLib.cmake
+++ b/CMake/FindGettextLib.cmake
@@ -19,7 +19,7 @@ FIND_LIBRARY( GETTEXT_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set GETTEXT_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( GETTEXT DEFAULT_MSG GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( GETTEXT DEFAULT_MSG GETTEXT_LIBRARY GETTEXT_INCLUDE_DIR  )
 
 MARK_AS_ADVANCED( GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY )
 
diff --git a/CMake/FindICUUC.cmake b/CMake/FindICUUC.cmake
index bab6cdceadede05a82b7937b1b07f1adc69a046e..df5c791adce0d2c55ec33704c291ee90ab15d264 100644
--- a/CMake/FindICUUC.cmake
+++ b/CMake/FindICUUC.cmake
@@ -19,7 +19,7 @@ FIND_LIBRARY( ICUUC_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set ICUUC_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( ICUUC DEFAULT_MSG ICUUC_INCLUDE_DIR ICUUC_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( ICUUC DEFAULT_MSG ICUUC_LIBRARY ICUUC_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( ICUUC_INCLUDE_DIR ICUUC_LIBRARY )
 
diff --git a/CMake/FindLTDL.cmake b/CMake/FindLTDL.cmake
index b58a01e9a30f0ca7a6b8cbad2748806211afc984..6196d15c92c58b07c28a922411a4803fcb476ecc 100644
--- a/CMake/FindLTDL.cmake
+++ b/CMake/FindLTDL.cmake
@@ -19,7 +19,7 @@ FIND_LIBRARY( LTDL_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set LTDL_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( LTDL DEFAULT_MSG LTDL_INCLUDE_DIR LTDL_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( LTDL DEFAULT_MSG LTDL_LIBRARY LTDL_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( LTDL_INCLUDE_DIR LTDL_LIBRARY )
 
diff --git a/CMake/FindLibKML.cmake b/CMake/FindLibKML.cmake
index 37b29d25f5b38d512cbfce32e1e05d4ff97f2325..c1ace4fec9f7667d43b24f2592a9ffc50714ab60 100644
--- a/CMake/FindLibKML.cmake
+++ b/CMake/FindLibKML.cmake
@@ -41,14 +41,15 @@ MARK_AS_ADVANCED(   LIBKML_INCLUDE_DIR
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( LibKML DEFAULT_MSG
-                                    LIBKML_INCLUDE_DIR
                                     LIBKML_BASE_LIBRARY
                                     LIBKML_CONVENIENCE_LIBRARY
                                     LIBKML_DOM_LIBRARY
                                     LIBKML_ENGINE_LIBRARY
                                     LIBKML_REGIONATOR_LIBRARY
                                     LIBKML_XSD_LIBRARY
-                                    LIBKML_MINIZIP_LIBRARY )
+                                    LIBKML_MINIZIP_LIBRARY
+                                    LIBKML_INCLUDE_DIR
+                                     )
 
 IF(LIBKML_FOUND)
   SET(LIBKML_INCLUDE_DIRS ${LIBKML_INCLUDE_DIR})
diff --git a/CMake/FindLibLAS.cmake b/CMake/FindLibLAS.cmake
index f3c7ae81edd4f78cbbf2b5dc96c711ef76c9017e..4a1ba35927ce0c88e1b86bd2cd3611469ade0fd4 100644
--- a/CMake/FindLibLAS.cmake
+++ b/CMake/FindLibLAS.cmake
@@ -19,7 +19,7 @@ FIND_LIBRARY( LIBLAS_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set LIBLAS_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( LIBLAS DEFAULT_MSG LIBLAS_INCLUDE_DIR LIBLAS_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( LIBLAS DEFAULT_MSG LIBLAS_LIBRARY LIBLAS_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( LIBLAS_INCLUDE_DIR LIBLAS_LIBRARY )
 
diff --git a/CMake/FindMuParser.cmake b/CMake/FindMuParser.cmake
index 0ea5dece2199249b1d8cb6fa6ed57acfd37ebab3..e225aba1c588067b882d6a95598eea66ca5f219a 100644
--- a/CMake/FindMuParser.cmake
+++ b/CMake/FindMuParser.cmake
@@ -21,6 +21,6 @@ FIND_LIBRARY( MUPARSER_LIBRARIES
 # handle the QUIETLY and REQUIRED arguments and set MUPARSER_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( MuParser DEFAULT_MSG MUPARSER_INCLUDE_DIR MUPARSER_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( MuParser DEFAULT_MSG MUPARSER_LIBRARIES MUPARSER_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( MUPARSER_INCLUDE_DIR MUPARSER_LIBRARIES )
diff --git a/CMake/FindOssim.cmake b/CMake/FindOssim.cmake
index 36843b7982862671c3439f4f65e66d71abdaa437..19920c879a6e3834f39186e31ee0e1534ebef2f2 100644
--- a/CMake/FindOssim.cmake
+++ b/CMake/FindOssim.cmake
@@ -22,7 +22,7 @@ FIND_LIBRARY(OSSIM_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set OSSIM_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( Ossim DEFAULT_MSG OSSIM_INCLUDE_DIR OSSIM_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( Ossim DEFAULT_MSG OSSIM_LIBRARY OSSIM_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( OSSIM_INCLUDE_DIR OSSIM_LIBRARY )
 
diff --git a/CMake/FindPqxx.cmake b/CMake/FindPqxx.cmake
index 773e6c14889506af05cfab764f85ecedf02e3c23..2181274e02856badf87bc2f12ef918c9c3ca8c08 100644
--- a/CMake/FindPqxx.cmake
+++ b/CMake/FindPqxx.cmake
@@ -20,7 +20,7 @@ FIND_LIBRARY( PQXX_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set PQXX_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( PQXX DEFAULT_MSG PQXX_INCLUDE_DIR PQXX_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( PQXX DEFAULT_MSG PQXX_LIBRARY PQXX_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( PQXX_INCLUDE_DIR PQXX_LIBRARY )
 
diff --git a/CMake/FindTinyXML.cmake b/CMake/FindTinyXML.cmake
index 7890c9ee99a9c65974a2273f722c80aa03cadb60..54e36216a4c1891606c85ed2a34bae73e6db006f 100644
--- a/CMake/FindTinyXML.cmake
+++ b/CMake/FindTinyXML.cmake
@@ -21,7 +21,7 @@ FIND_LIBRARY( TINYXML_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( TinyXML DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARY )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( TinyXML DEFAULT_MSG TINYXML_LIBRARY TINYXML_INCLUDE_DIR )
 
 MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARY )