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

sebastic pushed a commit to branch master
in repository osmium-tool.

commit 92b46a9a2799bd7f6ef86bc0ae73088c355b1da3
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Mon Aug 31 16:14:10 2015 +0200

    Imported Upstream version 1.2.1
---
 .travis.yml                         |  2 +-
 CHANGELOG.md                        | 16 ++++++++-
 CMakeLists.txt                      |  4 +--
 appveyor.yml                        | 13 +++----
 cmake/FindOsmium.cmake              | 69 +++++++++++++++----------------------
 cmake/run_test_compare_output.cmake | 16 ++++-----
 scripts/travis_install.sh           |  8 -----
 scripts/travis_script.sh            |  7 ++++
 src/cmd_factory.cpp                 |  2 +-
 src/command_fileinfo.cpp            |  2 +-
 src/command_renumber.cpp            | 11 +++++-
 src/main.cpp                        |  9 +++++
 test/CMakeLists.txt                 | 24 ++++++-------
 test/fileinfo/fi1-result.txt        |  4 +--
 test/renumber/CMakeLists.txt        |  7 +++-
 15 files changed, 107 insertions(+), 87 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c136fd1..6c57616 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ addons:
             - pandoc
 
 install:
-    - scripts/travis_install.sh
+    - git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git 
../libosmium
 
 script:
     - scripts/travis_script.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e221202..bbd700d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,19 @@ This project adheres to [Semantic 
Versioning](http://semver.org/).
 ### Fixed
 
 
+## [1.2.1] - 2015-08-31
+
+### Changed
+
+- Uses new libosmium version now (use at least libosmium version 2.4.1).
+
+### Fixed
+
+- Several Windows line ending issues were fixed. Consistently uses files
+  in binary mode now with LF line endings.
+- CRC calculation fixed in libosmium.
+
+
 ## [1.2.0] - 2015-08-18
 
 ### Added
@@ -77,7 +90,8 @@ This project adheres to [Semantic 
Versioning](http://semver.org/).
 - Minor updates to documentation and build system
 
 
-[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.2.0...HEAD
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/osmcode/osmium-tool/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/osmcode/osmium-tool/compare/v1.1.0...v1.2.0
 [1.1.1]: https://github.com/osmcode/osmium-tool/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/osmcode/osmium-tool/compare/v1.0.1...v1.1.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc42e0e..175e74e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ project(osmium)
 
 set(OSMIUM_VERSION_MAJOR 1)
 set(OSMIUM_VERSION_MINOR 2)
-set(OSMIUM_VERSION_PATCH 0)
+set(OSMIUM_VERSION_PATCH 1)
 
 set(OSMIUM_VERSION 
${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH})
 
@@ -43,7 +43,7 @@ set(AUTHOR "Jochen Topf <joc...@topf.org>")
 #-----------------------------------------------------------------------------
 
 find_package(Boost REQUIRED COMPONENTS program_options)
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 find_package(Osmium REQUIRED COMPONENTS io)
 include_directories(${OSMIUM_INCLUDE_DIRS})
diff --git a/appveyor.yml b/appveyor.yml
index 5b46f6a..8087f19 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,16 +9,10 @@ environment:
   - config: Dev
   - config: RelWithDebInfo
 
-# branches to build
-branches:
-  # whitelist
-  only:
-    - master
-
 shallow_clone: true
 
 # Operating system (build VM template)
-os: Visual Studio 2014 CTP4
+os: Visual Studio 2015
 
 # scripts that are called at very beginning, before repo cloning
 init:
@@ -65,7 +59,7 @@ build_script:
     -DOsmium_DEBUG=TRUE
     -DCMAKE_BUILD_TYPE=%config%
     -DBOOST_ROOT=%LODEPSDIR%\boost
-    
-DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_57.lib
+    
-DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_58.lib
     -DZLIB_LIBRARY=%LODEPSDIR%\zlib\lib\zlibwapi.lib
     -DZLIB_INCLUDE_DIR=%LODEPSDIR%\zlib\include
     -DEXPAT_LIBRARY=%LODEPSDIR%\expat\lib\libexpat.lib
@@ -86,3 +80,6 @@ build_script:
 #    -DBZIP2_INCLUDE_DIR=%LODEPSDIR%\bzip2\include
 #  - nmake VERBOSE=1
 
+test_script:
+  - ctest --output-on-failure -C %config%
+
diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
index bb14071..b3a4c95 100644
--- a/cmake/FindOsmium.cmake
+++ b/cmake/FindOsmium.cmake
@@ -19,7 +19,7 @@
 #    Then add the following in your CMakeLists.txt:
 #
 #      find_package(Osmium REQUIRED COMPONENTS <XXX>)
-#      include_directories(${OSMIUM_INCLUDE_DIRS})
+#      include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
 #
 #    For the <XXX> substitute a space separated list of one or more of the
 #    following components:
@@ -56,32 +56,12 @@ find_path(OSMIUM_INCLUDE_DIR osmium/osm.hpp
     PATH_SUFFIXES include
     PATHS
         ../libosmium
-        ../../libosmium
-        libosmium
         ~/Library/Frameworks
         /Library/Frameworks
-        /usr/local
-        /usr/
         /opt/local # DarwinPorts
         /opt
 )
 
-# Handle the QUIETLY and REQUIRED arguments and set OSMIUM_FOUND to TRUE if
-# all listed variables are TRUE.
-include(FindPackageHandleStandardArgs)
-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)
-    message(FATAL_ERROR "Can not find libosmium headers, please install them 
or configure the paths")
-endif()
-
 #----------------------------------------------------------------------
 #
 #  Check for optional components
@@ -113,6 +93,7 @@ if(Osmium_USE_PBF)
     find_package(ZLIB)
     find_package(Threads)
 
+    list(APPEND OSMIUM_EXTRA_FIND_VARS ZLIB_FOUND Threads_FOUND)
     if(ZLIB_FOUND AND Threads_FOUND)
         list(APPEND OSMIUM_PBF_LIBRARIES
             ${ZLIB_LIBRARIES}
@@ -125,7 +106,6 @@ if(Osmium_USE_PBF)
             ${ZLIB_INCLUDE_DIR}
         )
     else()
-        set(_missing_libraries 1)
         message(WARNING "Osmium: Can not find some libraries for PBF 
input/output, please install them or configure the paths.")
     endif()
 endif()
@@ -138,6 +118,7 @@ if(Osmium_USE_XML)
     find_package(ZLIB)
     find_package(Threads)
 
+    list(APPEND OSMIUM_EXTRA_FIND_VARS EXPAT_FOUND BZIP2_FOUND ZLIB_FOUND 
Threads_FOUND)
     if(EXPAT_FOUND AND BZIP2_FOUND AND ZLIB_FOUND AND Threads_FOUND)
         list(APPEND OSMIUM_XML_LIBRARIES
             ${EXPAT_LIBRARIES}
@@ -151,7 +132,6 @@ if(Osmium_USE_XML)
             ${ZLIB_INCLUDE_DIR}
         )
     else()
-        set(_missing_libraries 1)
         message(WARNING "Osmium: Can not find some libraries for XML 
input/output, please install them or configure the paths.")
     endif()
 endif()
@@ -172,12 +152,12 @@ if(Osmium_USE_GEOS)
     find_path(GEOS_INCLUDE_DIR geos/geom.h)
     find_library(GEOS_LIBRARY NAMES geos)
 
+    list(APPEND OSMIUM_EXTRA_FIND_VARS GEOS_INCLUDE_DIR GEOS_LIBRARY)
     if(GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
         SET(GEOS_FOUND 1)
         list(APPEND OSMIUM_LIBRARIES ${GEOS_LIBRARY})
         list(APPEND OSMIUM_INCLUDE_DIRS ${GEOS_INCLUDE_DIR})
     else()
-        set(_missing_libraries 1)
         message(WARNING "Osmium: GEOS library is required but not found, 
please install it or configure the paths.")
     endif()
 endif()
@@ -187,11 +167,11 @@ endif()
 if(Osmium_USE_GDAL)
     find_package(GDAL)
 
+    list(APPEND OSMIUM_EXTRA_FIND_VARS GDAL_FOUND)
     if(GDAL_FOUND)
         list(APPEND OSMIUM_LIBRARIES ${GDAL_LIBRARIES})
         list(APPEND OSMIUM_INCLUDE_DIRS ${GDAL_INCLUDE_DIRS})
     else()
-        set(_missing_libraries 1)
         message(WARNING "Osmium: GDAL library is required but not found, 
please install it or configure the paths.")
     endif()
 endif()
@@ -202,12 +182,12 @@ if(Osmium_USE_PROJ)
     find_path(PROJ_INCLUDE_DIR proj_api.h)
     find_library(PROJ_LIBRARY NAMES proj)
 
+    list(APPEND OSMIUM_EXTRA_FIND_VARS PROJ_INCLUDE_DIR PROJ_LIBRARY)
     if(PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
         set(PROJ_FOUND 1)
         list(APPEND OSMIUM_LIBRARIES ${PROJ_LIBRARY})
         list(APPEND OSMIUM_INCLUDE_DIRS ${PROJ_INCLUDE_DIR})
     else()
-        set(_missing_libraries 1)
         message(WARNING "Osmium: PROJ.4 library is required but not found, 
please install it or configure the paths.")
     endif()
 endif()
@@ -217,21 +197,19 @@ endif()
 if(Osmium_USE_SPARSEHASH)
     find_path(SPARSEHASH_INCLUDE_DIR google/sparsetable)
 
+    list(APPEND OSMIUM_EXTRA_FIND_VARS SPARSEHASH_INCLUDE_DIR)
     if(SPARSEHASH_INCLUDE_DIR)
         # Find size of sparsetable::size_type. This does not work on older
         # CMake versions because they can do this check only in C, not in C++.
-        include(CheckTypeSize)
-        set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR})
-        set(CMAKE_EXTRA_INCLUDE_FILES "google/sparsetable")
-        check_type_size("google::sparsetable<int>::size_type" 
SPARSETABLE_SIZE_TYPE LANGUAGE CXX)
-        set(CMAKE_EXTRA_INCLUDE_FILES)
-        set(CMAKE_REQUIRED_INCLUDES)
-
-        # Falling back to checking size_t if 
google::sparsetable<int>::size_type
-        # could not be checked.
-        if(SPARSETABLE_SIZE_TYPE STREQUAL "")
-            check_type_size("void*" VOID_PTR_SIZE)
-            set(SPARSETABLE_SIZE_TYPE ${VOID_PTR_SIZE})
+        if (NOT CMAKE_VERSION VERSION_LESS 3.0)
+           include(CheckTypeSize)
+           set(CMAKE_REQUIRED_INCLUDES ${SPARSEHASH_INCLUDE_DIR})
+           set(CMAKE_EXTRA_INCLUDE_FILES "google/sparsetable")
+           check_type_size("google::sparsetable<int>::size_type" 
SPARSETABLE_SIZE_TYPE LANGUAGE CXX)
+           set(CMAKE_EXTRA_INCLUDE_FILES)
+           set(CMAKE_REQUIRED_INCLUDES)
+        else()
+           set(SPARSETABLE_SIZE_TYPE ${CMAKE_SIZEOF_VOID_P})
         endif()
 
         # Sparsetable::size_type must be at least 8 bytes (64bit), otherwise
@@ -244,7 +222,6 @@ if(Osmium_USE_SPARSEHASH)
             message(WARNING "Osmium: Disabled Google SparseHash library on 
32bit system (size_type=${SPARSETABLE_SIZE_TYPE}).")
         endif()
     else()
-        set(_missing_libraries 1)
         message(WARNING "Osmium: Google SparseHash library is required but not 
found, please install it or configure the paths.")
     endif()
 endif()
@@ -274,8 +251,18 @@ endif()
 #  Check that all required libraries are available
 #
 #----------------------------------------------------------------------
-if(Osmium_FIND_REQUIRED AND _missing_libraries)
-    message(FATAL_ERROR "Required library or libraries missing. Aborting.")
+list(REMOVE_DUPLICATES OSMIUM_EXTRA_FIND_VARS)
+# Handle the QUIETLY and REQUIRED arguments and set OSMIUM_FOUND to TRUE if
+# all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Osmium REQUIRED_VARS OSMIUM_INCLUDE_DIR 
${OSMIUM_EXTRA_FIND_VARS})
+unset(OSMIUM_EXTRA_FIND_VARS)
+
+# Copy the results to the output variables.
+if(OSMIUM_FOUND)
+    set(OSMIUM_INCLUDE_DIRS ${OSMIUM_INCLUDE_DIR} ${OSMIUM_INCLUDE_DIRS})
+else()
+    set(OSMIUM_INCLUDE_DIRS "")
 endif()
 
 #----------------------------------------------------------------------
diff --git a/cmake/run_test_compare_output.cmake 
b/cmake/run_test_compare_output.cmake
index 854b3d5..1b60d6a 100644
--- a/cmake/run_test_compare_output.cmake
+++ b/cmake/run_test_compare_output.cmake
@@ -32,14 +32,14 @@ execute_process(
     ERROR_VARIABLE stderr
 )
 
-if(result)
-    message(SEND_ERROR "Error when calling '${cmd}': ${result}")
-endif()
-
 if(NOT (stderr STREQUAL ""))
     message(SEND_ERROR "Command tested wrote to stderr: ${stderr}")
 endif()
 
+if(result)
+    message(FATAL_ERROR "Error when calling '${cmd}': ${result}")
+endif()
+
 if(cmd2)
     message("Executing: ${cmd2}")
     separate_arguments(cmd2)
@@ -52,13 +52,13 @@ if(cmd2)
         ERROR_VARIABLE stderr
     )
 
-    if(result)
-        message(SEND_ERROR "Error when calling '${cmd}': ${result}")
-    endif()
-
     if(NOT (stderr STREQUAL ""))
         message(SEND_ERROR "Command tested wrote to stderr: ${stderr}")
     endif()
+
+    if(result)
+        message(FATAL_ERROR "Error when calling '${cmd}': ${result}")
+    endif()
 endif()
 
 set(compare "${CMAKE_COMMAND} -E compare_files ${reference} ${output}")
diff --git a/scripts/travis_install.sh b/scripts/travis_install.sh
deleted file mode 100755
index d0e5b33..0000000
--- a/scripts/travis_install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-#  travis_install.sh
-#
-
-cd ..
-git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git
-
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 75b3b36..d11ac79 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -19,11 +19,18 @@ if [ "${CXX}" = "g++" ]; then
     CC=gcc-4.8
 fi
 
+echo "travis_fold:start:cmake\nRunning cmake..."
 cmake -LA \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     ${WORKAROUND} \
     ..
+echo "travis_fold:end:cmake"
 
+echo "travis_fold:start:make\nRunning make..."
 make VERBOSE=1
+echo "travis_fold:end:make"
+
+echo "travis_fold:start:ctest\nRunning ctest..."
 ctest --output-on-failure
+echo "travis_fold:end:ctest"
 
diff --git a/src/cmd_factory.cpp b/src/cmd_factory.cpp
index cfe82fc..62c3cdf 100644
--- a/src/cmd_factory.cpp
+++ b/src/cmd_factory.cpp
@@ -39,7 +39,7 @@ int CommandFactory::max_command_name_length() {
     osmium::max_op<int> max_width;
 
     for (const auto& cmd : instance().m_commands) {
-        max_width.update(cmd.first.length());
+        max_width.update(int(cmd.first.length()));
     }
 
     return max_width();
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 4937b1c..a811cd0 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -192,7 +192,7 @@ public:
     }
 
     void data(const osmium::io::Header& header, const InfoHandler& 
info_handler) override final {
-        std::cout << "Data: " << "\n";
+        std::cout << "Data:\n";
         std::cout << "  Bounding box: " << info_handler.bounds << "\n";
 
         if (info_handler.first_timestamp() != osmium::end_of_time()) {
diff --git a/src/command_renumber.cpp b/src/command_renumber.cpp
index 2c21e19..3eca5d8 100644
--- a/src/command_renumber.cpp
+++ b/src/command_renumber.cpp
@@ -1,5 +1,4 @@
 /*
-
 Osmium -- OpenStreetMap data manipulation command line tool
 http://osmcode.org/osmium
 
@@ -29,6 +28,10 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <sys/stat.h>
 #include <vector>
 
+#ifdef _WIN32
+# include <io.h>
+#endif
+
 #include <boost/program_options.hpp>
 
 #include <osmium/index/index.hpp>
@@ -147,6 +150,9 @@ void CommandRenumber::read_index(osmium::item_type type, 
const std::string& name
         }
         throw std::runtime_error(std::string("Can't open file '") + f + "': " 
+ strerror(errno));
     }
+#ifdef _WIN32
+    _setmode(fd, _O_BINARY);
+#endif
 
     size_t file_size = osmium::util::file_size(fd);
     if (file_size % sizeof(remap_index_value_type) != 0) {
@@ -175,6 +181,9 @@ void CommandRenumber::write_index(osmium::item_type type, 
const std::string& nam
     if (fd < 0) {
         throw std::runtime_error(std::string("Can't open file '") + f + "': " 
+ strerror(errno));
     }
+#ifdef _WIN32
+    _setmode(fd, _O_BINARY);
+#endif
 
     std::vector<remap_index_value_type> data;
     std::copy(index(type).begin(), index(type).end(), 
std::back_inserter(data));
diff --git a/src/main.cpp b/src/main.cpp
index 029fa00..3fa6eac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,6 +24,11 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <string>
 #include <vector>
 
+#ifdef _WIN32
+# include <fcntl.h>
+# include <io.h>
+#endif
+
 #include "cmd.hpp"
 
 enum return_code : int {
@@ -33,6 +38,10 @@ enum return_code : int {
 };
 
 int main(int argc, char *argv[]) {
+#ifdef _WIN32
+    _setmode(1, _O_BINARY);
+#endif
+
     std::string command = argv[0];
 
     // remove path from command
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a255bfa..456b4d1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -35,29 +35,29 @@ endfunction()
 #-----------------------------------------------------------------------------
 
 function(check_output _dir _name _command _reference)
-    set(_cmd "${PROJECT_BINARY_DIR}/src/osmium ${_command}")
+    set(_cmd "$<TARGET_FILE:osmium> ${_command}")
     add_test(
         NAME "${_dir}-${_name}"
         COMMAND ${CMAKE_COMMAND}
-        -Dcmd=${_cmd}
-        -Ddir=${PROJECT_SOURCE_DIR}/test
-        -Dreference=${PROJECT_SOURCE_DIR}/test/${_reference}
-        -Doutput=${PROJECT_BINARY_DIR}/test/${_dir}/cmd-output-${_name}
+        -D cmd:FILEPATH=${_cmd}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -D reference:FILEPATH=${PROJECT_SOURCE_DIR}/test/${_reference}
+        -D 
output:FILEPATH=${PROJECT_BINARY_DIR}/test/${_dir}/cmd-output-${_name}
         -P ${CMAKE_SOURCE_DIR}/cmake/run_test_compare_output.cmake
     )
 endfunction()
 
 function(check_output2 _dir _name _command1 _command2 _reference)
-    set(_cmd1 "${PROJECT_BINARY_DIR}/src/osmium ${_command1}")
-    set(_cmd2 "${PROJECT_BINARY_DIR}/src/osmium ${_command2}")
+    set(_cmd1 "$<TARGET_FILE:osmium> ${_command1}")
+    set(_cmd2 "$<TARGET_FILE:osmium> ${_command2}")
     add_test(
         NAME "${_dir}-${_name}"
         COMMAND ${CMAKE_COMMAND}
-        -Dcmd=${_cmd1}
-        -Dcmd2=${_cmd2}
-        -Ddir=${PROJECT_SOURCE_DIR}/test
-        -Dreference=${PROJECT_SOURCE_DIR}/test/${_reference}
-        -Doutput=${PROJECT_BINARY_DIR}/test/${_dir}/cmd-output-${_name}
+        -D cmd:FILEPATH=${_cmd1}
+        -D cmd2:FILEPATH=${_cmd2}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -D reference:FILEPATH=${PROJECT_SOURCE_DIR}/test/${_reference}
+        -D 
output:FILEPATH=${PROJECT_BINARY_DIR}/test/${_dir}/cmd-output-${_name}
         -P ${CMAKE_SOURCE_DIR}/cmake/run_test_compare_output.cmake
     )
 endfunction()
diff --git a/test/fileinfo/fi1-result.txt b/test/fileinfo/fi1-result.txt
index be20387..d665a5a 100644
--- a/test/fileinfo/fi1-result.txt
+++ b/test/fileinfo/fi1-result.txt
@@ -9,14 +9,14 @@ Header:
   Options:
     generator=testdata
     version=0.6
-Data: 
+Data:
   Bounding box: (1,1,1,3)
   Timestamps:
     First: 2015-01-01T01:00:00Z
     Last: 2015-01-01T04:00:00Z
   Objects ordered (by type and id): yes
   Multiple versions of same object: no
-  CRC32: 92bb4b6b
+  CRC32: 8e178104
   Number of changesets: 0
   Number of nodes: 3
   Number of ways: 0
diff --git a/test/renumber/CMakeLists.txt b/test/renumber/CMakeLists.txt
index b46bab6..78fa435 100644
--- a/test/renumber/CMakeLists.txt
+++ b/test/renumber/CMakeLists.txt
@@ -14,8 +14,13 @@ function(check_renumber2 _name _in1 _in2 _out)
     set(_idxdir "${PROJECT_BINARY_DIR}/test/renumber/index")
     file(REMOVE_RECURSE ${_idxdir})
     file(MAKE_DIRECTORY ${_idxdir})
+    if(WIN32)
+        set(_devnull "nul")
+    else()
+        set(_devnull "/dev/null")
+    endif()
     check_output2(renumber ${_name}
-                  "renumber --index-directory=${_idxdir} --generator=test -f 
osm --overwrite -o /dev/null renumber/${_in1}"
+                  "renumber --index-directory=${_idxdir} --generator=test -f 
osm --overwrite -o ${_devnull} renumber/${_in1}"
                   "renumber --index-directory=${_idxdir} --generator=test -f 
osc renumber/${_in2}"
                   "renumber/${_out}"
     )

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to