[osmium-tool] 46/97: Move essential compile options from OsmiumOptions.cmake to FindOsmium.cmake.

[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 98299d99df9dff73e581ef1576e8044edfc40a9a
Author: Jochen Topf <jochen at topf.org>
Date:   Tue Dec 16 17:00:00 2014 +0100

    Move essential compile options from OsmiumOptions.cmake to FindOsmium.cmake.
---
 cmake/FindOsmium.cmake    | 13 +++++++++++++
 cmake/OsmiumOptions.cmake | 11 +----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/cmake/FindOsmium.cmake b/cmake/FindOsmium.cmake
index 2c87db2..d84bf84 100644
--- a/cmake/FindOsmium.cmake
+++ b/cmake/FindOsmium.cmake
@@ -217,6 +217,19 @@ endif()
 
 #----------------------------------------------------------------------
 
+add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64)
+
+if(MSVC)
+    add_definitions(-wd4996 -DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+if(APPLE)
+    add_compile_options(-stdlib=libc++)
+    set(LDFLAGS ${LDFLAGS} -stdlib=libc++)
+endif()
+
+#----------------------------------------------------------------------
+
 list(REMOVE_DUPLICATES OSMIUM_INCLUDE_DIRS)
 list(REMOVE_DUPLICATES OSMIUM_LIBRARIES)
 
diff --git a/cmake/OsmiumOptions.cmake b/cmake/OsmiumOptions.cmake
index ac4811c..a09795a 100644
--- a/cmake/OsmiumOptions.cmake
+++ b/cmake/OsmiumOptions.cmake
@@ -1,10 +1,6 @@
 # Setup common compiler options adviced for building Osmium headers
 
-add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64)
-
-if(MSVC)
-    add_definitions(-wd4996 -DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS)
-else()
+if(NOT MSVC)
     add_compile_options(
         -Wall
         -Wextra
@@ -23,9 +19,4 @@ else()
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g")
 endif()
 
-if(APPLE)
-    add_compile_options(-stdlib=libc++)
-    set(LDFLAGS ${LDFLAGS} -stdlib=libc++)
-endif(APPLE)
-
 message(STATUS "Some compiler and linker options were changed by OsmiumOptions")

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