[osmium-tool] 52/97: CMake config: Add threading support for all IO functions, not only PBF.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Tue Jul 21 20:15:34 UTC 2015


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 3355bf84c738fb198cf8fd6e3623d39c09651bc3
Author: Jochen Topf <jochen at topf.org>
Date:   Thu Dec 18 11:55:30 2014 +0100

    CMake config: Add threading support for all IO functions, not only PBF.
---
 cmake/FindOsmium.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
index 56bc39e..e4494fb 100644
--- a/cmake/FindOsmium.cmake
+++ b/cmake/FindOsmium.cmake
@@ -130,11 +130,12 @@ if(OSMIUM_USE_XML)
   find_package(ZLIB)
   find_package(EXPAT)
 
-  if(BZIP2_FOUND AND EXPAT_FOUND AND ZLIB_FOUND)
+  if(EXPAT_FOUND AND BZIP2_FOUND AND ZLIB_FOUND)
     list(APPEND OSMIUM_LIBRARIES
+      ${EXPAT_LIBRARIES}
       ${BZIP2_LIBRARIES}
-      ${ZLIB_LIBRARY}
-      ${EXPAT_LIBRARY}
+      ${ZLIB_LIBRARIES}
+      ${CMAKE_THREAD_LIBS_INIT}
     )
     list(APPEND OSMIUM_INCLUDE_DIRS
       ${EXPAT_INCLUDE_DIR}

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



More information about the Pkg-grass-devel mailing list