diff --git a/CMakeLists.txt b/CMakeLists.txt index 0afdcca4..8a36c9dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules;${CMAKE_MODULE_PATH}" set( SFCGAL_VERSION_MAJOR 1 ) set( SFCGAL_VERSION_MINOR 3 ) -set( SFCGAL_VERSION_PATCH 7 ) +set( SFCGAL_VERSION_PATCH 8 ) set( SFCGAL_VERSION "${SFCGAL_VERSION_MAJOR}.${SFCGAL_VERSION_MINOR}.${SFCGAL_VERSION_PATCH}" ) @@ -109,7 +109,7 @@ if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 58)) message( STATUS "Defining BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" ) add_definitions( "-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" ) endif() -# patch boost 1.60.0 +# patch boost 1.60.0 if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 60) AND (${Boost_SUBMINOR_VERSION} EQUAL 0)) include_directories( patches/boost-1.60.0 ) endif() @@ -133,13 +133,13 @@ if ( SFCGAL_WITH_OSG ) endif() #-- note that SYSTEM turns -I/path to -isystem and avoid warnings in CGAL and Boost -include_directories( SYSTEM +include_directories( SYSTEM ${CGAL_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) link_directories( ${CGAL_LIBRARY_DIRS} - ${Boost_LIBRARY_DIRS} + ${Boost_LIBRARY_DIRS} ) #-- Warnings, frounding-math and gprof ------------------------------------------ @@ -154,7 +154,7 @@ if(MSVC) endif() elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) # Update if necessary - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-long-long -pedantic -Wpointer-arith -Wcast-align -Wcast-qual -Wno-overloaded-virtual -Wformat=2 -Winit-self -Wmissing-include-dirs -Wwrite-strings -Wno-error=undef")#-Wfloat-equal -Wconversion -Wshadow + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-long-long -pedantic -Wpointer-arith -Wcast-align -Wcast-qual -Wno-overloaded-virtual -Wformat=2 -Winit-self -Wmissing-include-dirs -Wwrite-strings -Wno-error=undef")#-Wfloat-equal -Wconversion -Wshadow if( SFCGAL_WARNING_AS_ERROR ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=format") endif() diff --git a/NEWS b/NEWS index f98f8d63..2a490432 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,22 @@ +1.3.8 (2020-06-29): +NOTE: This is the last release on Github. Oslandia migrates from GitHub to GitLab: + - https://github.com/Oslandia/SFCGAL/issues/230 + - https://oslandia.com/en/2020/06/19/en-oslandia-migrates-from-github-to-gitlab/ +Changes: + * Fix CMake scripts so that SFCGAL_USE_STATIC_LIBS works properly again (Dave Chambers) + * Fix for divide by zero error in triangulatePolygon3D (Fix #190, by Dave Chambers) + * Replace of auto_ptr with unique_ptr and move to c++14 (Sébastien Loriot) + * Add implementation of Geometry::operator= (Hugo Mercier) + * Fix CGAL v4.7 compatibility (Enrico Weigelt) + * add pkg-config descriptor file (Enrico Weigelt) + * Remove libtoolize (Loïc Bartoletti) + * Add point_m and is_measured to c api (Hannes Janetzek) + * Fix SFCGAL with CGAL 5 (and GMPXX issues) (Fix #198, by Loïc Bartoletti) + * Add covers and covers3D to c api (Loïc Bartoletti) + * Add documentation to SFCGAL::algorithm::extrude (Fix #110, by Daniel Cumberbatch) + * Add 3D linear referencing / LineSubString (Fix #130, by Daniel Cumberbatch) and Fix built with MSCV 14 (< VisualStudio 2019 version 16.1) and export to C API (Loïc Bartoletti) + * Fix CAPI export symbol for windows (Loïc Bartoletti) + * Update and fix documentation (Fix #138, by Daniel Cumberbatch) 1.3.7 (2019-06-03): * Fix compilation with CGAL 4.14 (fix #188, path by Sebastien Loriot) * Build Triangulation even with intersecting constraint edges (Patch by Darafei Praliaskouski) @@ -60,5 +79,5 @@ * Add detection of lib64 directories 1.0.4 (2013-11-29): Fix compilation with CGAL 4.3 - + For older news, see https://github.com/Oslandia/SFCGAL/releases