BUG: mantis #1397

CMake/FindLibKML.cmake

@@ -31,55 +31,35 @@ if( LIBKML_INCLUDE_DIR )
     set( LibKML_FIND_QUIETLY TRUE )
 endif()
 
-find_path( LIBKML_INCLUDE_DIR kml/dom.h )
+find_path( LIBKML_INCLUDE_DIR       kml/dom.h )
+find_library( LIBKML_BASE_LIBRARY   NAMES kmlbase )
+find_library( LIBKML_DOM_LIBRARY    NAMES kmldom )
+find_library( LIBKML_ENGINE_LIBRARY NAMES kmlengine )
 
-find_library( LIBKML_BASE_LIBRARY
-              NAMES kmlbase )
-
-# TODO : add HINTS derived from path of LIBKML_BASE_LIBRARY
-find_library( LIBKML_CONVENIENCE_LIBRARY
-              NAMES kmlconvenience )
-find_library( LIBKML_DOM_LIBRARY
-              NAMES kmldom )
-find_library( LIBKML_ENGINE_LIBRARY
-              NAMES kmlengine )
-find_library( LIBKML_REGIONATOR_LIBRARY
-              NAMES kmlregionator )
-find_library( LIBKML_XSD_LIBRARY
-              NAMES kmlxsd )
-find_library( LIBKML_MINIZIP_LIBRARY
-              NAMES minizip )
-
-mark_as_advanced(   LIBKML_INCLUDE_DIR
-                    LIBKML_BASE_LIBRARY
-                    LIBKML_CONVENIENCE_LIBRARY
-                    LIBKML_DOM_LIBRARY
-                    LIBKML_ENGINE_LIBRARY
-                    LIBKML_REGIONATOR_LIBRARY
-                    LIBKML_XSD_LIBRARY
-                    LIBKML_MINIZIP_LIBRARY )
+mark_as_advanced(
+  LIBKML_INCLUDE_DIR
+  LIBKML_BASE_LIBRARY
+  LIBKML_DOM_LIBRARY
+  LIBKML_ENGINE_LIBRARY
+  )
 
 # handle the QUIETLY and REQUIRED arguments and set LIBKML_FOUND to TRUE if
 # all listed variables are TRUE
 include( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( LibKML DEFAULT_MSG
-                                    LIBKML_BASE_LIBRARY
-                                    LIBKML_CONVENIENCE_LIBRARY
-                                    LIBKML_DOM_LIBRARY
-                                    LIBKML_ENGINE_LIBRARY
-                                    LIBKML_REGIONATOR_LIBRARY
-                                    LIBKML_XSD_LIBRARY
-                                    LIBKML_MINIZIP_LIBRARY
-                                    LIBKML_INCLUDE_DIR
-                                     )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  LibKML
+  DEFAULT_MSG
+  LIBKML_INCLUDE_DIR
+  LIBKML_BASE_LIBRARY
+  LIBKML_DOM_LIBRARY
+  LIBKML_ENGINE_LIBRARY
+  )
 
 if(LIBKML_FOUND)
   set(LIBKML_INCLUDE_DIRS ${LIBKML_INCLUDE_DIR})
-  set(LIBKML_LIBRARIES ${LIBKML_BASE_LIBRARY}
-                       ${LIBKML_CONVENIENCE_LIBRARY}
-                       ${LIBKML_DOM_LIBRARY}
-                       ${LIBKML_ENGINE_LIBRARY}
-                       ${LIBKML_REGIONATOR_LIBRARY}
-                       ${LIBKML_XSD_LIBRARY}
-                       ${LIBKML_MINIZIP_LIBRARY})
+  set(LIBKML_LIBRARIES
+    ${LIBKML_BASE_LIBRARY}
+    ${LIBKML_DOM_LIBRARY}
+    ${LIBKML_ENGINE_LIBRARY}
+    )
 endif()