[osmium-tool] 70/97: Do not set -std=c++11 option for MSVC.

[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 d574c7ec380f2bc8727694472fc65fdf592b9a51
Author: Jochen Topf <jochen at topf.org>
Date:   Thu Jan 29 17:00:36 2015 +0100

    Do not set -std=c++11 option for MSVC.
---
 CMakeLists.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e892b6..a05399e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,15 +134,16 @@ endif(ASTYLE)
 #  Decide which C++ version to use (Minimum/default: C++11).
 #
 #-----------------------------------------------------------------------------
-
-if(NOT USE_CPP_VERSION)
-    set(USE_CPP_VERSION c++11)
+if(NOT MSVC)
+    if(NOT USE_CPP_VERSION)
+        set(USE_CPP_VERSION c++11)
+    endif()
+    message(STATUS "Use C++ version: ${USE_CPP_VERSION}")
+    # following only available from cmake 2.8.12:
+    #   add_compile_options(-std=${USE_CPP_VERSION})
+    # so using this instead:
+    add_definitions(-std=${USE_CPP_VERSION})
 endif()
-message(STATUS "Use C++ version: ${USE_CPP_VERSION}")
-# following only available from cmake 2.8.12:
-#   add_compile_options(-std=${USE_CPP_VERSION})
-# so using this instead:
-add_definitions(-std=${USE_CPP_VERSION})
 
 
 #-----------------------------------------------------------------------------

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