Skip to content
This repository was archived by the owner on Jul 27, 2022. It is now read-only.

merge work done in libkml/libkml to google/libkml #6

Open
rashadkm wants to merge 906 commits into
base: master
Choose a base branch
from
Open

merge work done in libkml/libkml to google/libkml #6

rashadkm wants to merge 906 commits into from

Conversation

@rashadkm
Copy link

@rashadkm rashadkm commented Aug 15, 2015

This PR includes:
change of build system to CMake,
cleanup of thirdparty libraries,
couple of PR's from sebastic
and a windows specific pr from alex
and some other bug fixes reported by coverity scan.

kml.bent and others added 30 commits March 31, 2010 19:32
Element::DeleteFromArrayAt(),DeleteSchemaAt(),DeleteStyleSelectorAt().
0670407
kmlregionator testdata file
eed1b34
KmlFeatureListSaver
b0ec870
kmlregionator uses KmlFeatureListSaver
61d15c0
add CreateBasicLink
76108de
create a rel="up" to the root KML link in each node
29ad8a1
fix include guard, add usage comment
181fb56
Remove the main() from individual tests and link with gtest's own main()
44c2619 
instead. (Eases the pain of other projects running libkml's unit tests in their
builds.)
straggler from last commit
25906cd
more details about the csv data
8c54b12
Don't use non-const refs. Add unit test.
edf8ef7
run tests with the gtest main lib
297fd9e
Avoid an infinite loop in kmlbase::CreateExpandedStrings if the repla…
33d2309 
…cement

value contains its key.
rename unzAttach, unzDetach symbols to resolve conflicts in other pro…
b03a082 
…jects that link with both libkml and minizip
If KmzSplit has no subfile to split out, clear the passed subfile str…
249d6be 
…ing.
add XmlOstreamSerializer
bc31c60
add SerializeToOstream
a5089f5
add SerializeToOstream
6ec1f2c
add SerializeToOstream to round trip tests
711e51b
add xml_ostream_serializer*
a4cb4e2
license whitespace fix
93eb92e
make templatize XmlSerializer
933ba03
remove XmlOstreamSerializer (now implemented using templatized XmlSer…
8af328b 
…ializer)
remove in favor of templatized XmlSerializer
398044a
license whitespace fix
0efc32c
use XmlSerializer<T> for KmlFile::Serialize
1bff344
license whitespace fix
b5becbe
license whitespace fix
cb58fc3
license whitespace fix
b630676
remove performance warning... perf of iostream is 2-3x that of string
6127c57
rkanavath and others added 26 commits July 26, 2015 18:31
@rkanavath
supress long-long warning from minizip
0387a33
@sebastic @rkanavath
Fix Java JAR installation directory, /usr/share/java instead of /usr/…
f9b93e0 
…lib/java.
@rkanavath
followup to pull request #201. missing cmake install(TARGETS
d63ed54
@rkanavath
LibKML.jar have incorrect dependencies
1bd8826
@rkanavath
incorrect target_link for java bindings
ea10bbd
@rkanavath
consider also include from install prefix
f224550
@rkanavath
removed msvc sln file
f2bb8de
@sebastic @rkanavath
Fix Java JAR installation directory, /usr/share/java instead of /usr/…
8668dce 
…lib/java.
@sebastic
Default to python interpreter library path when none is specified
d6167f0
@rashadkm
Merge pull request #202 from sebastic/python-install-path
282c1a1 
Default to python interpreter library path when none is specified
@rkanavath
unused parameter warning
d351c76
@rkanavath
configure libkml.pc package config file
b5c91bd
@rkanavath
install pkg-config file
be56ce1
@rkanavath
downgrade uriparser to 0.7.5 to fix windows build
671dd79
@rkanavath
download minizip from sourceforge libkml-files
e73fa2c
@sebastic
Fix pkgconfig install path (<prefix>/share/ -> <prefix>/lib/pkgconfig/)
81a0954
@rashadkm
Merge pull request #203 from sebastic/pkgconfig-install-path
8ba168a 
Fix pkgconfig install path (<prefix>/share/ -> <prefix>/lib/pkgconfig/)
@sebastic
Fix SWIG Java shared library install path (/usr/share/java -> /usr/lib)
007e316
@rashadkm
Merge pull request #204 from sebastic/java-swig-library-install-path
57de6a7 
Fix SWIG Java shared library install path (/usr/share/java -> /usr/lib)
@rkanavath
do not build bindings if swig is not found
aa83cf4
@sebastic
Fix JNI library installation path (usr/lib -> usr/lib/jni)
e0c53bb
@rashadkm
Merge pull request #205 from sebastic/jni-install-path
723d85a 
Fix JNI library installation path (usr/lib -> usr/lib/jni)
@AlexBobkov
Fixed Windows build
ae920b2
@AlexBobkov
Fixed Windows build
4fbb113
@rashadkm
Merge pull request #206 from AlexBobkov/master
fcf9a3f 
Fixed Windows build
@rkanavath
Merge remote-tracking branch 'libkml_upstream/master' into libkml-merge
6ae4ffe
@rashadkm rashadkm mentioned this pull request Aug 15, 2015
Open
@yzhong52
Copy link

yzhong52 commented Aug 24, 2015

Maybe better to fix the Travis CI first?

@rashadkm
Copy link
Author

rashadkm commented Aug 24, 2015

travis build is failing for google/libkml. But it is fine in https://github.com/libkml/libkml/
travis build for google/libkml has been failing before pull request.
Also note there are changes in .travis.yml in the pull request as the build system is moved to cmake.

@rashadkm rashadkm mentioned this pull request Nov 28, 2015
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@rashadkm @yzhong52 @mashbridge @rkanavath @sebastic @AlexBobkov