diff --git a/INSTALL-LINUX b/INSTALL-LINUX
index c42c84567..128d69573 100644
--- a/INSTALL-LINUX
+++ b/INSTALL-LINUX
@@ -27,7 +27,6 @@ CONTENTS
- FTDI D2XX
- SRMIO
- liboauth
- - libkml
- libvlc - Video playback in training mode
- libical - Diary window and CalDAV support (external calendar integration)
- libusb - If you want support for using USB2 sticks in Train View
@@ -205,51 +204,6 @@ $ make
You now have SRM support built in.
-LIBKML - For export to Google Earth
------------------------------------
-
-You will need Google Earth 5.2 or later and therefore libkml that supports this.
-
-$ sudo apt-get install libkml-dev
-
-if this does not work you will need to build from source:
-
- $ sudo apt-get install subversion
- $ sudo apt-get install expat libexpat1 libexpat1-dev
-
- Once svn is installed you can grab the libkml source, configure, build and
- install:
- $ cd ~/Projects
- $ svn checkout http://libkml.googlecode.com/svn/trunk/ libkml
- $ cd libkml
-
- You will need automake and friends (see SRMIO above)
- $ sh autogen.sh
- $ ./configure
- $ make
- $ make install
- $ sudo make install
-
- If you get errors about use of 'long long' then edit:
- - src/kml/{convenience,dom,engine,regionator,xsd}/Makefile
- - examples/{engine,gpx,gx,hellonet,helloworld,regionator,xsd}/Makefile
- - and look for the flag -pedantic and remove it. I got this on Linux 64bit builds ymmv.
-
-Once libkml is installed:
-
-$ cd ~/Projects/GoldenCheetah/src
-$ vi gcconfig.pri
-
-Ensure KML_INSTALL=/usr/local
-
-Make clean is needed if you have previously built, since source files examine
-#defines before including this feature. You can skip it if you know why ;)
-$ make clean
-$ qmake
-$ make
-
-You can now export rides to Google Earth kml format.
-
LIBICAL - Diary integration with Google or MobileMe calendars
-------------------------------------------------------------
diff --git a/INSTALL-MAC b/INSTALL-MAC
index 454b3db5d..8af572716 100644
--- a/INSTALL-MAC
+++ b/INSTALL-MAC
@@ -30,7 +30,6 @@ CONTENTS
2. ADDING OPTIONAL DEPENDENCIES
- FTDI D2XX
- SRMIO
- - libkml
- libusb
- libical
@@ -251,7 +250,6 @@ $ open src/GoldenCheetah.app
===============================
- SRMIO
- - libkml
- libusb
- libical
@@ -266,19 +264,7 @@ should be taken into account.
SRMIO (git)
./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking
-2.2 libkml - For export to Google Earth
----------------------------------------
-
-expat (2.0.1)
-./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking
-
-libkml (pulled down from the svn repo)
-
-./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking --with-expat-include-dir=/usr/local/include --with-expat-lib-dir=/usr/local/lib --disable-swig CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64"
-
-note: the added CXXFLAGS helped clear the -Werror flag that stopped compilation.
-
-2.3 libusb - For Garmin USB2 stick support
+2.2 libusb - For Garmin USB2 stick support
------------------------------------------
libusb (0.1.12)
@@ -295,7 +281,7 @@ make install
note: that the sed line updates some commands in libtool. not sure why the arch clags are not getting passed.
-2.4 libical
+2.3 libical
-----------
libical (0.46)
diff --git a/INSTALL-WIN32 b/INSTALL-WIN32
index 2a88f9a41..6796990f2 100644
--- a/INSTALL-WIN32
+++ b/INSTALL-WIN32
@@ -165,10 +165,6 @@ Info: I plan to provide a pre-compiled set of the dependencies for the Windows v
The version currently used is: "CDM v2.10.00 WHQL Certified" - while there are more recent
version available for download.
-- Google Earth .kml files (export)
- -- Is part of the official build as a static lib - build is done with MSVC2015 - the build uses Release 1.2
- (path of source code has changed to https://github.com/google/libkml)
-
- iCal Calendar support (prerequisite for the "Diary" view)
-- Is part of the official build as a static lib - the build uses Release 1.0.1
diff --git a/src/FileIO/KmlRideFile.cpp b/deprecated/KmlRideFile.cpp
similarity index 100%
rename from src/FileIO/KmlRideFile.cpp
rename to deprecated/KmlRideFile.cpp
diff --git a/src/FileIO/KmlRideFile.h b/deprecated/KmlRideFile.h
similarity index 100%
rename from src/FileIO/KmlRideFile.h
rename to deprecated/KmlRideFile.h
diff --git a/src/Gui/GcCrashDialog.cpp b/src/Gui/GcCrashDialog.cpp
index 746c1ca8d..94df7f93f 100644
--- a/src/Gui/GcCrashDialog.cpp
+++ b/src/Gui/GcCrashDialog.cpp
@@ -184,13 +184,6 @@ QString GcCrashDialog::versionHTML()
d2xx = "yes";
#endif
- // -- KML ----
- QString kml = "none";
-
- #ifdef GC_HAVE_KML
- kml = "yes";
- #endif
-
// -- ICAL ----
QString ical = "none";
@@ -268,7 +261,6 @@ QString GcCrashDialog::versionHTML()
"| %3 | %4 |
"
"| SRMIO | %5 |
"
"| D2XX | %6 |
"
- "| KML | %8 |
"
"| ICAL | %9 |
"
"| USBXPRESS | %10 |
"
"| LIBUSB | %11 |
"
@@ -289,7 +281,6 @@ QString GcCrashDialog::versionHTML()
.arg(COMPILER_VERSION)
.arg(srmio)
.arg(d2xx)
- .arg(kml)
.arg(ical)
.arg(usbxpress)
.arg(libusb)
diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in
index 4acc6d42b..a6d58ba4f 100644
--- a/src/gcconfig.pri.in
+++ b/src/gcconfig.pri.in
@@ -112,26 +112,6 @@
#D2XX_INCLUDE =
#D2XX_LIBS =
-# If you want support for Google Earth .kml files then you need
-# to install the Google libkml library
-#
-# http://code.google.com/p/libkml/
-# or on Linux sudo apt-get install libkml-dev
-#
-# then set the following variable appropriately
-# to the root of the libs/include path
-#KML_INSTALL = /usr/local
-#KML_INCLUDE =
-#KML_LIBS =
-# Since KML also requires BOOST you will need to install
-# that too and then set BOOST_INCLUDE to that location
-# If the files are in /usr/include/boost then set
-#BOOST_INCLUDE = /usr/include
-#Additionally, on MAC the latest libs also need the following
-#QMAKE_CFLAGS_X86_64 += -mmacosx-version-min=10.7
-#QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
-#LIBS += -lexpat -luriparser -lminizip
-
# If you want support for downloading from iCal calendars you will need libical
# http://sourceforge.net/projects/freeassociation/
# Set path to the root of the libical installation
diff --git a/src/src.pro b/src/src.pro
index 5e7f6b592..f8aee7e22 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -351,32 +351,6 @@ contains(DEFINES, "GC_WANT_R") {
}
-###=====================================
-### OPTIONAL => GOOGLE KML IMPORT EXPORT
-###=====================================
-
-!isEmpty(KML_INSTALL) {
-
- # we will work out the rest if you tell use where it is installed
- isEmpty(KML_INCLUDE) { KML_INCLUDE = $${KML_INSTALL}/include }
- isEmpty(KML_LIBS) { KML_LIBS = -L$${KML_INSTALL}/lib/ \
- -lkmldom -lkmlconvenience -lkmlengine -lkmlbase
- }
-
- # on MS VS the linker wants /LTCG for libkmldom due to
- # "MSIL .netmodule or module compiled with /GL found"
- win32-msvc* { QMAKE_LFLAGS += /LTCG }
-
- DEFINES += GC_HAVE_KML
- INCLUDEPATH += $${KML_INCLUDE} $${BOOST_INCLUDE}
- LIBS += $${KML_LIBS}
-
- # add kml file i/o
- SOURCES += FileIO/KmlRideFile.cpp
- HEADERS += FileIO/KmlRideFile.h
-}
-
-
###=================
### OPTIONAL => ICAL
###=================
diff --git a/travis/linux/before_install.sh b/travis/linux/before_install.sh
index 1bbb85c70..b1f077e5e 100755
--- a/travis/linux/before_install.sh
+++ b/travis/linux/before_install.sh
@@ -10,7 +10,6 @@ sudo apt-get install -qq qt5-default qt515base qt515tools qt515serialport\
sudo apt-get install -qq libglu1-mesa-dev
sudo apt-get install -qq libsamplerate0-dev
-sudo apt-get install -qq libkml-dev
sudo apt-get install -qq libical-dev
# Add VLC 3
diff --git a/travis/linux/before_script.sh b/travis/linux/before_script.sh
index dc510bfd0..3293bfbda 100755
--- a/travis/linux/before_script.sh
+++ b/travis/linux/before_script.sh
@@ -27,8 +27,6 @@ sed -i "s|#\(DEFINES += GC_VIDEO_VLC.*\)|\1|" src/gcconfig.pri
sed -i "s|#\(DEFINES += GC_WANT_R.*\)|\1|" src/gcconfig.pri
# Enable CloudDB
sed -i "s|^#CloudDB|CloudDB|" src/gcconfig.pri
-# LIBKML
-sed -i "s|#\(KML_INSTALL =\).*|\1 /usr|" src/gcconfig.pri
# D2XX
sed -i "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX/release|" src/gcconfig.pri
# SAMPLERATE
diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh
index 37232be36..e1ec87f98 100755
--- a/travis/osx/before_install.sh
+++ b/travis/osx/before_install.sh
@@ -13,8 +13,6 @@ brew install libical
brew upgrade libusb
brew install libsamplerate
rm -rf '/usr/local/include/c++'
-## Disable KML for now
-## brew install --HEAD travis/libkml.rb
sudo chmod -R +w /usr/local
# R 4.1.1
diff --git a/travis/osx/before_script.sh b/travis/osx/before_script.sh
index ce6a49c6d..2087e1824 100755
--- a/travis/osx/before_script.sh
+++ b/travis/osx/before_script.sh
@@ -37,9 +37,6 @@ sed -i "" "s|#\(SRMIO_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.4.24.dylib|" src/FileIO/D2XX.cpp
sed -i "" "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX|" src/gcconfig.pri
sed -i "" "s|#\(D2XX_LIBS =.*\)|\1 -L../D2XX -lftd2xx|" src/gcconfig.pri
-## Disable KML for now
-#sed -i "" "s|#\(KML_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
-#sed -i "" "s|#\(KML_LIBS =.*\)|\1 -L/usr/local/lib -lkmlxsd -lkmlregionator -lkmldom -lkmlconvenience -lkmlengine -lkmlbase -lexpect|" src/gcconfig.pri
sed -i "" "s|#\(ICAL_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
sed -i "" "s|#\(ICAL_LIBS =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri