diff --git a/.travis.yml b/.travis.yml index 42497802f..81522f631 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ matrix: addons: &gcc7 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'lcov'] + packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev', 'lcov'] env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Debug' ENABLE_COVERAGE=ON CUCUMBER_TIMEOUT=20000 before_script: - cd ${TRAVIS_BUILD_DIR} @@ -87,7 +87,7 @@ matrix: addons: &gcc7 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000 LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/scripts/travis/leaksanitizer.conf" - os: linux @@ -95,7 +95,7 @@ matrix: addons: &clang50 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev'] env: CLANG_VERSION='5.0.0' BUILD_TYPE='Debug' CUCUMBER_TIMEOUT=60000 - os: linux @@ -120,7 +120,7 @@ matrix: addons: &gcc7 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Release' - os: linux @@ -134,7 +134,7 @@ matrix: addons: &gcc7 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-7', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-7', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Release' ENABLE_STXXL=On - os: linux @@ -142,7 +142,7 @@ matrix: addons: &gcc49 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'ccache'] + packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev', 'ccache'] env: CCOMPILER='gcc-4.9' CXXCOMPILER='g++-4.9' BUILD_TYPE='Release' - os: linux @@ -150,7 +150,7 @@ matrix: addons: &gcc49 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'ccache'] + packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev', 'ccache'] env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' - os: osx @@ -167,7 +167,7 @@ matrix: addons: &gcc7 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-7', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON # Node build jobs. These skip running the tests. diff --git a/CMakeLists.txt b/CMakeLists.txt index 9997d11c1..4443999ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,6 @@ if(ENABLE_MASON) set(MASON_LUA_VERSION "5.2.4") set(MASON_BZIP2_VERSION "1.0.6") set(MASON_TBB_VERSION "2017_U7") - set(MASON_LIBSHP_VERSION "1.3.0") message(STATUS "Enabling mason") diff --git a/cmake/FindShapefile.cmake b/cmake/FindShapefile.cmake deleted file mode 100644 index 5b90ec622..000000000 --- a/cmake/FindShapefile.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# - Try to find Shapefile C Library -# http://shapelib.maptools.org/ -# -# Exports: -# Shapefile_FOUND -# LIBSHAPEFILE_INCLUDE_DIR -# LIBSHAPEFILE_LIBRARY -# Hints: -# LIBSHAPEFILE_LIBRARY_DIR - -find_path(LIBSHAPEFILE_INCLUDE_DIR - shapefil.h) - -find_library(LIBSHAPEFILE_LIBRARY - NAMES shp - HINTS "${LIBSHAPEFILE_LIBRARY_DIR}") - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Shapefile DEFAULT_MSG - LIBSHAPEFILE_LIBRARY LIBSHAPEFILE_INCLUDE_DIR) -mark_as_advanced(LIBSHAPEFILE_INCLUDE_DIR LIBSHAPEFILE_LIBRARY)