Merge pull request geo-data#11 from Jule-/master

Visual Studio compilation with CMake

CMakeLists.txt

@@ -12,12 +12,14 @@ include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 
-if(COMPILER_SUPPORTS_CXX11)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-elseif(COMPILER_SUPPORTS_CXX0X)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-else()
-  message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+if(NOT MSVC)
+  if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  elseif(COMPILER_SUPPORTS_CXX0X)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+  else()
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+  endif()
 endif()
 
 # We need g++ >= version 4.7 (see
@@ -52,8 +54,17 @@ install(FILES ${PROJECT_BINARY_DIR}/config.hpp DESTINATION include/ctb)
 
 # Perform as many checks as possible on debug builds:
 #    cmake -DCMAKE_BUILD_TYPE=Debug ..
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra --pedantic")
-#set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra --pedantic")
+if(NOT MSVC)
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra --pedantic")
+  #set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra --pedantic")
+endif()
+
+# We need GDAL
+find_package(GDAL)
+if(NOT GDAL_FOUND)
+  message(FATAL_ERROR "The GDAL library cannot be found on the system")
+endif()
+include_directories(${GDAL_INCLUDE_DIRS})
 
 # Build and install libctb
 include_directories("${PROJECT_SOURCE_DIR}/src")

src/CMakeLists.txt

@@ -1,17 +1,10 @@
-# We need GDAL
-find_package(GDAL)
-if(NOT GDAL_FOUND)
-  message(FATAL_ERROR "The GDAL library cannot be found on the system")
-endif()
-include_directories(${GDAL_INCLUDE_DIRS})
-
 # Ensure we have a unified GDAL: `GDALOpenEx` is only present after
 # unification.
 include(CheckLibraryExists)
 check_library_exists(gdal GDALOpenEx "gdal.h" HAVE_UNIFIED_GDAL)
-if(NOT HAVE_UNIFIED_GDAL)
+if(NOT MSVC AND NOT HAVE_UNIFIED_GDAL)
   message(FATAL_ERROR "The GDAL version must be one that implements RFC 46 (GDAL/OGR unification) i.e. >= 2.0.0")
-endif(NOT HAVE_UNIFIED_GDAL)
+endif()
 
 # We need zlib
 find_package(ZLIB)

src/GDALTile.hpp

@@ -24,6 +24,7 @@
 
 #include "gdal_priv.h"
 
+#include "config.hpp"           // for CTB_DLL
 #include "Tile.hpp"
 
 namespace ctb {
@@ -41,7 +42,7 @@ namespace ctb {
  * linear approximation) which wraps an image transformer.  The VRT owns any top
  * level transformer, but we are responsible for the wrapped image transformer.
  */
-class ctb::GDALTile :
+class CTB_DLL ctb::GDALTile :
   public Tile
 {
 public:

src/GDALTiler.hpp

@@ -59,7 +59,7 @@ struct ctb::TilerOptions {
  * the reference count is decremented and, if it reaches `0`, the dataset is
  * closed.
  */
-class ctb::GDALTiler {
+class CTB_DLL ctb::GDALTiler {
 public:
 
   /// Instantiate a tiler with all required arguments

src/GlobalGeodetic.hpp

@@ -35,7 +35,7 @@ namespace ctb {
  * This class models the [Tile Mapping Service Global Geodetic
  * Profile](http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-geodetic).
  */
-class ctb::GlobalGeodetic:
+class CTB_DLL ctb::GlobalGeodetic :
   public Grid {
 public:
 

src/GlobalMercator.hpp

@@ -22,6 +22,7 @@
  * @brief This defines the `GlobalMercator` class
  */
 
+#include "config.hpp"           // for CTB_DLL
 #include "Grid.hpp"
 
 namespace ctb {
@@ -34,7 +35,7 @@ namespace ctb {
  * This class models the [Tile Mapping Service Global Mercator
  * Profile](http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-mercator).
  */
-class ctb::GlobalMercator:
+class CTB_DLL ctb::GlobalMercator :
   public Grid {
 public:
 

src/TerrainTile.hpp

@@ -41,7 +41,7 @@ namespace ctb {
  * This aims to implement the Cesium [heightmap-1.0 terrain
  * format](http://cesiumjs.org/data-and-assets/terrain/formats/heightmap-1.0.html).
  */
-class ctb::Terrain {
+class CTB_DLL ctb::Terrain {
 public:
 
   /// Create an empty terrain object
@@ -180,7 +180,7 @@ class ctb::Terrain {
  * Associating terrain data with a tile coordinate allows the tile to be
  * converted to a geo-referenced raster (see `TerrainTile::heightsToRaster`).
  */
-class ctb::TerrainTile :
+class CTB_DLL ctb::TerrainTile :
   public Terrain, public Tile
 {
   friend class TerrainTiler;

src/TerrainTiler.hpp

@@ -36,7 +36,7 @@ namespace ctb {
  * `GDALTiler::createTerrainTile` method enabling `TerrainTile`s to be created
  * for a specific `TileCoordinate`.
  */
-class ctb::TerrainTiler :
+class CTB_DLL ctb::TerrainTiler :
   public GDALTiler
 {
 public:

src/config.hpp.in

@@ -25,6 +25,20 @@
  * `config.hpp`.
  */
 
+/* Enable symbol export in Visual Studio 2013 as per issue #6.  This is an
+   adaptation of `CPL_DLL` in GDAL's `cpl_port.h`. */
+#ifndef CTB_DLL
+#if defined(_MSC_VER)
+#  if !defined(CPL_DISABLE_DLL)
+#    define CTB_DLL     __declspec(dllexport)
+#  else
+#    define CTB_DLL     __declspec(dllimport)
+#  endif
+#else
+#  define CTB_DLL
+#endif
+#endif
+
 #include <string>
 #include <sstream>
 

tools/CMakeLists.txt

@@ -1,3 +1,6 @@
+# The tools are not shared libraries
+add_definitions(-DCPL_DISABLE_DLL)
+
 set(TOOL_TARGETS commander ctb)
 
 # Add the `ctb-tile` executable

tools/ctb-tile.cpp

@@ -262,7 +262,7 @@ setIteratorSize(T &iter) {
 
 /// A thread safe wrapper around `GDALTermProgress`
 static int
-termProgress(double dfComplete, const char *pszMessage, void *pProgressArg) {
+CPL_STDCALL termProgress(double dfComplete, const char *pszMessage, void *pProgressArg) {
   static mutex mutex;          // GDALTermProgress isn't thread safe, so lock it
   int status;
 
@@ -274,7 +274,7 @@ termProgress(double dfComplete, const char *pszMessage, void *pProgressArg) {
 
 /// In a thread safe manner describe the file just created
 static int
-verboseProgress(double dfComplete, const char *pszMessage, void *pProgressArg) {
+CPL_STDCALL verboseProgress(double dfComplete, const char *pszMessage, void *pProgressArg) {
   stringstream stream;
   stream << "[" << (int) (dfComplete*100) << "%] " << pszMessage << endl;
   cout << stream.str();