[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src: move o5mreader sources to 3rdparty directory
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2016-09-06 12:01:13
Message-ID: E1bhF3x-0005WZ-PN () code ! kde ! org
[Download RAW message or body]

Git commit 900a199dbe6851be1e20c42a73c44b2745bdad43 by Bernhard Beschow.
Committed on 06/09/2016 at 10:00.
Pushed by beschow into branch 'master'.

move o5mreader sources to 3rdparty directory

A  +11   -0    src/3rdparty/o5mreader/CMakeLists.txt
A  +17   -0    src/3rdparty/o5mreader/LICENSE
R  +0    -0    src/3rdparty/o5mreader/o5mreader.cpp [from: src/plugins/runn=
er/osm/o5mreader.cpp - 100% similarity]
R  +0    -0    src/3rdparty/o5mreader/o5mreader.h [from: src/plugins/runner=
/osm/o5mreader.h - 100% similarity]
M  +1    -0    src/CMakeLists.txt
M  +3    -1    src/plugins/runner/osm/CMakeLists.txt

http://commits.kde.org/marble/900a199dbe6851be1e20c42a73c44b2745bdad43

diff --git a/src/3rdparty/o5mreader/CMakeLists.txt b/src/3rdparty/o5mreader=
/CMakeLists.txt
new file mode 100644
index 0000000..a622509
--- /dev/null
+++ b/src/3rdparty/o5mreader/CMakeLists.txt
@@ -0,0 +1,11 @@
+project(o5mreader)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(o5mreader_SRCS
+    o5mreader.cpp)
+
+add_library(o5mreader STATIC ${o5mreader_SRCS})
diff --git a/src/3rdparty/o5mreader/LICENSE b/src/3rdparty/o5mreader/LICENSE
new file mode 100644
index 0000000..0997c5d
--- /dev/null
+++ b/src/3rdparty/o5mreader/LICENSE
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/src/plugins/runner/osm/o5mreader.cpp b/src/3rdparty/o5mreader/=
o5mreader.cpp
similarity index 100%
rename from src/plugins/runner/osm/o5mreader.cpp
rename to src/3rdparty/o5mreader/o5mreader.cpp
diff --git a/src/plugins/runner/osm/o5mreader.h b/src/3rdparty/o5mreader/o5=
mreader.h
similarity index 100%
rename from src/plugins/runner/osm/o5mreader.h
rename to src/3rdparty/o5mreader/o5mreader.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e7e761..af0a716 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,6 +51,7 @@ if(NOT ZLIB_FOUND)
   set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zlib" "${CMA=
KE_CURRENT_BINARY_DIR}/3rdparty/zlib")
 endif()
 =

+add_subdirectory( 3rdparty/o5mreader )
 add_subdirectory( 3rdparty/sgp4 )
 add_subdirectory( lib/marble )
 add_subdirectory( lib/astro )
diff --git a/src/plugins/runner/osm/CMakeLists.txt b/src/plugins/runner/osm=
/CMakeLists.txt
index 99828a0..2272c75 100644
--- a/src/plugins/runner/osm/CMakeLists.txt
+++ b/src/plugins/runner/osm/CMakeLists.txt
@@ -1,6 +1,7 @@
 PROJECT( OsmPlugin )
 =

 INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/src/3rdparty/o5mreader
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/writers
  ${CMAKE_CURRENT_SOURCE_DIR}/translators
@@ -29,7 +30,6 @@ set( osm_SRCS
   OsmWay.cpp
   OsmRelation.cpp
   OsmElementDictionary.cpp
-  o5mreader.cpp
 )
 =

 marble_add_plugin( OsmPlugin ${osm_SRCS} ${osm_writers_SRCS} ${osm_transla=
tors_SRCS} )
@@ -49,6 +49,8 @@ if(NOT KF5_FOUND)
     return()
 endif()
 =

+target_link_libraries(OsmPlugin o5mreader)
+
 # register marble part as handler
 # install again once part is fixed to load and show the passed file
 # install(FILES marble_part_osm.desktop DESTINATION ${KDE_INSTALL_KSERVICE=
S5DIR})
[prev in list] [next in list] [prev in thread] [next in thread]