Commit f50437c3 authored by Ben Boeckel's avatar Ben Boeckel

kml: remove; no longer necessary

parent 69e54f56
......@@ -28,7 +28,6 @@ function (superbuild_find_projects var)
ftgl
gdal
hdf5
kml
moab
netcdf
numpy
......
......@@ -117,7 +117,6 @@ ignore_project_warnings(boost)
ignore_project_warnings(gdal)
ignore_project_warnings(hdf5)
ignore_project_errors(hdf5)
ignore_project_warnings(kml)
ignore_project_warnings(python)
ignore_project_warnings(qt4)
ignore_project_warnings(shiboken)
......
include("${CMAKE_CURRENT_LIST_DIR}/../kml.cmake")
superbuild_apply_patch(kml add-missing-unistd.h
"file_posix.cc misses including unistd.h")
diff -Nru5 src/src/kml/base/file_posix.cc src.add-missing-unistd.h/src/kml/base/file_posix.cc
--- src/src/kml/base/file_posix.cc 2012-04-06 08:25:40.000000000 -0400
+++ src.add-missing-unistd.h/src/kml/base/file_posix.cc 2016-02-23 17:04:57.943711396 -0500
@@ -30,10 +30,13 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+// posix compile fix:
+#include <unistd.h>
+
namespace kmlbase {
// Internal to the POSIX File class.
static bool StatFile(const char* path, struct stat* stat_data) {
struct stat tmp;
......@@ -13,7 +13,7 @@ superbuild_add_project(cmb
DEVELOPER_MODE
DEBUGGABLE
DEFAULT_ON
DEPENDS boost remus vxl kml gdal qt4 python paraview shiboken
DEPENDS boost remus vxl gdal qt4 python paraview shiboken
cmbworkflows zeromq opencv
smtk # XXX(smtk): until the submodule works properly
DEPENDS_OPTIONAL moab smtk cumulus ${cmb_extra_optional_dependencies}
......
superbuild_add_project(kml
DEPENDS_OPTIONAL cxx11
CMAKE_ARGS
-DBUILD_SHARED_LIBS=OFF)
......@@ -79,7 +79,7 @@ superbuild_add_project(paraview
#currently catalyst is having problems on praxis so lets disable it for now
-DPARAVIEW_ENABLE_CATALYST:BOOL=OFF
#CMB needs geovis enabled to provide the kml and gdal readers
#CMB needs geovis enabled to provide the gdal reader
-DModule_vtkGeovisCore:BOOL=ON
-DModule_vtkIOGDAL:BOOL=ON
-DModule_vtkViewsInfovis:BOOL=ON
......
include("${CMAKE_CURRENT_LIST_DIR}/../kml.cmake")
superbuild_apply_patch(kml fix-util-header
"Fix compile failure on VS2010")
diff -Nru5 src/src/kml/base/util.h src.XXXXXX/src/kml/base/util.h
--- src/src/kml/base/util.h 2012-04-06 08:25:40.000000000 -0400
+++ src.XXXXXX/src/kml/base/util.h 2016-02-23 17:05:08.442661996 -0500
@@ -24,32 +24,33 @@
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef KML_BASE_UTIL_H__
#define KML_BASE_UTIL_H__
-#ifndef _MSC_VER
-#include <stdint.h> // For fixed-size interger typedefs in this file.
-#endif
-
-// A macro to disallow the evil copy constructor and assignment operator.
-// Should be used in the private: declarations for a class.
-#define LIBKML_DISALLOW_EVIL_CONSTRUCTORS(TypeName) \
- TypeName(const TypeName&);\
- void operator=(const TypeName&)
-
-typedef unsigned int uint;
-// MSVC has no header for C99 typedefs.
-#ifdef _MSC_VER
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
+// Visual Studio versions < 10 do not contain stdint. Assumes
+// all other platforms include this c99 standard header.
+# include <stdint.h>
+#else
+// MSVC versions prior to v10 have no header for C99 typedefs.
typedef __int8 int8_t;
typedef __int16 int16_t;
typedef __int32 int32_t;
typedef __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
-#endif // _MSC_VER
+#endif
+
+typedef unsigned int uint;
+
+// A macro to disallow the evil copy constructor and assignment operator.
+// Should be used in the private: declarations for a class.
+#define LIBKML_DISALLOW_EVIL_CONSTRUCTORS(TypeName) \
+ TypeName(const TypeName&);\
+ void operator=(const TypeName&)
#include <string>
// A convenience for the internal build system at Google.
#ifndef HAS_GLOBAL_STRING
......@@ -53,10 +53,6 @@ superbuild_set_revision(remus
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/remus.git"
GIT_TAG 378c70d5f7ebd3323e724f60b4dbc2ba2dfc3011)
superbuild_set_revision(kml
URL "http://vtk.org/files/support/libkml_fa6c7d8.tar.gz"
URL_MD5 261b39166b18c2691212ce3495be4e9c)
superbuild_set_revision(gdal
# https://github.com/judajake/gdal-svn.git
URL "http://www.paraview.org/files/dependencies/gdal-95abc689c1e356b3fcb0a2b71f53f4f23917b56c.tar.bz2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment