[osmium-tool] 60/97: Updated FindOsmium.cmake from upstream (libosmium repository).

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 0bddb0bb787bee5963e93fd31cca322f036ee8ea
Author: Jochen Topf <jochen at topf.org>
Date:   Wed Jan 28 17:17:03 2015 +0100

    Updated FindOsmium.cmake from upstream (libosmium repository).
---
 cmake/FindOsmium.cmake | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
index c0ea9f9..15b1e01 100644
--- a/cmake/FindOsmium.cmake
+++ b/cmake/FindOsmium.cmake
@@ -9,16 +9,15 @@
 #
 #  Usage:
 #
-#    Copy this file (and OsmiumOptions.cmake) somewhere into your project
-#    directory, where cmake can find it. Usually this will be a directory
-#    called "cmake" which you can add to your module search path with the
-#    following line in your CMakeLists.txt:
+#    Copy this file somewhere into your project directory, where cmake can
+#    find it. Usually this will be a directory called "cmake" which you can
+#    add to the CMake module search path with the following line in your
+#    CMakeLists.txt:
 #
 #      list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 #
 #    Then add the following in your CMakeLists.txt:
 #
-#      include(OsmiumOptions)
 #      find_package(Osmium REQUIRED COMPONENTS <XXX>)
 #      include_directories(${OSMIUM_INCLUDE_DIRS})
 #
@@ -75,6 +74,8 @@ find_package_handle_standard_args(OSMIUM REQUIRED_VARS OSMIUM_INCLUDE_DIR)
 # Copy the results to the output variables.
 if(OSMIUM_FOUND)
     set(OSMIUM_INCLUDE_DIRS ${OSMIUM_INCLUDE_DIR})
+else()
+    set(OSMIUM_INCLUDE_DIRS "")
 endif()
 
 if(Osmium_FIND_REQUIRED AND NOT OSMIUM_FOUND)
@@ -234,10 +235,22 @@ endif()
 #----------------------------------------------------------------------
 
 list(REMOVE_DUPLICATES OSMIUM_INCLUDE_DIRS)
-list(REMOVE_DUPLICATES OSMIUM_XML_LIBRARIES)
-list(REMOVE_DUPLICATES OSMIUM_PBF_LIBRARIES)
-list(REMOVE_DUPLICATES OSMIUM_IO_LIBRARIES)
-list(REMOVE_DUPLICATES OSMIUM_LIBRARIES)
+
+if(OSMIUM_XML_LIBRARIES)
+    list(REMOVE_DUPLICATES OSMIUM_XML_LIBRARIES)
+endif()
+
+if(OSMIUM_PBF_LIBRARIES)
+    list(REMOVE_DUPLICATES OSMIUM_PBF_LIBRARIES)
+endif()
+
+if(OSMIUM_IO_LIBRARIES)
+    list(REMOVE_DUPLICATES OSMIUM_IO_LIBRARIES)
+endif()
+
+if(OSMIUM_LIBRARIES)
+    list(REMOVE_DUPLICATES OSMIUM_LIBRARIES)
+endif()
 
 #----------------------------------------------------------------------
 #
@@ -279,7 +292,7 @@ endif()
 # This is a set of recommended warning options that can be added when compiling
 # libosmium code.
 if(MSVC)
-    set(OSMIUM_WARNING_OPTIONS "/W2 /wd4514" CACHE STRING "Recommended warning options for libosmium")
+    set(OSMIUM_WARNING_OPTIONS "/W3 /wd4514" CACHE STRING "Recommended warning options for libosmium")
 else()
     set(OSMIUM_WARNING_OPTIONS "-Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast -Wno-return-type" CACHE STRING "Recommended warning options for libosmium")
 endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git