[Git][debian-gis-team/sfcgal][master] 4 commits: Add libcgdal-dev to libsfcgal-dev dependencies, libCGAL & libCGAL_Core are now explicitly linked.

Bas Couwenberg gitlab at salsa.debian.org
Wed Apr 11 10:39:21 UTC 2018 

Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal


Commits:
d9eb010c by Bas Couwenberg at 2018-04-11T09:55:12+02:00
Add libcgdal-dev to libsfcgal-dev dependencies, libCGAL & libCGAL_Core are now explicitly linked.

- - - - -
40b85fad by Bas Couwenberg at 2018-04-11T11:08:33+02:00
Add upstream patches to fix linking with CGAL & its dependencies.

- - - - -
8c340b57 by Bas Couwenberg at 2018-04-11T12:04:14+02:00
Close bug in chanelog.

- - - - -
5411b35f by Bas Couwenberg at 2018-04-11T12:04:31+02:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/cleanup-links-and-dependencies.patch
- + debian/patches/fix-linking-with-CGAL-and-CGAL-dependencies.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sfcgal (1.3.4-2) unstable; urgency=medium
+
+  * Add libcgdal-dev to libsfcgal-dev dependencies,
+    libCGAL & libCGAL_Core are now explicitly linked.
+  * Add upstream patches to fix linking with CGAL & its dependencies.
+    (closes: #895388)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 Apr 2018 12:04:16 +0200
+
 sfcgal (1.3.4-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Architecture: any
 Section: libdevel
 Depends: libsfcgal1 (= ${binary:Version}),
          libsfcgal-osg1 (= ${binary:Version}),
+         libcgal-dev (>= 4.10.1),
          ${misc:Depends}
 Description: Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations (development)
  SFCGAL is a C++ wrapper library around CGAL with the aim of


=====================================
debian/patches/cleanup-links-and-dependencies.patch
=====================================
--- /dev/null
+++ b/debian/patches/cleanup-links-and-dependencies.patch
@@ -0,0 +1,322 @@
+Description: cleanup links and dependencies
+ SFCGAL does not directly depends an gmp and mpfr, so there is no need to
+ look for them, they are pulled by CGAL
+Author: Vincent Mora <vincent.mora at oslandia.com>
+Origin: https://github.com/Oslandia/SFCGAL/pull/163/commits/5a2369d44e8f38d75bb187f5abcee5ae2b788c17
+Bug: https://github.com/Oslandia/SFCGAL/pull/163
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,32 +82,6 @@ if((${Boost_MAJOR_VERSION} EQUAL 1) AND
+   include_directories( patches/boost-1.60.0 )
+ endif()
+ 
+-#-- GMP (facultative)  -------------------------------------
+-find_package( GMP )
+-if( ${GMP_FOUND} )
+-	message( STATUS "GMP_INCLUDE_DIRS = ${GMP_INCLUDE_DIRS}" )
+-	message( STATUS "GMP_LIBRARIES = ${GMP_LIBRARIES}" )
+-	set( SFCGAL_WITH_GMP ON )
+-endif()
+-
+-
+-
+-#-- MPFR (needs GMP)  --------------------------------------
+-if( ${GMP_FOUND} )
+-	find_package( MPFR )
+-	if( ${MPFR_FOUND} )
+-		message( STATUS "MPFR_INCLUDE_DIRS = ${MPFR_INCLUDE_DIRS}" )
+-		message( STATUS "MPFR_LIBRARIES = ${MPFR_LIBRARIES}" )
+-		set( SFCGAL_WITH_MPFR ON )
+-	endif()
+-endif()
+-
+-if( NOT ${GMP_FOUND} OR NOT ${MPFR_FOUND} )
+-	message( WARNING "can't find GMP and MPFR, using default kernel" ) 
+-	set( EPLU_USE_CARTESIAN_KERNEL ON )
+-endif()
+-
+-
+ #-- OpenScenegraph -----------------------------------------
+ if ( SFCGAL_WITH_OSG )
+   find_package( OpenSceneGraph COMPONENTS osgDB osgUtil )
+@@ -143,14 +117,10 @@ endif()
+ include_directories( SYSTEM 
+ 	${CGAL_INCLUDE_DIRS}
+ 	${Boost_INCLUDE_DIRS}	
+-	${MPFR_INCLUDE_DIRS}	
+-	${GMP_INCLUDE_DIRS}	
+ )
+ link_directories(
+ 	${CGAL_LIBRARY_DIRS}
+ 	${Boost_LIBRARY_DIRS}	
+-	${MPFR_LIBRARY_DIRS}	
+-	${GMP_LIBRARY_DIRS}	
+ )
+ 
+ #-- Warnings, frounding-math and gprof  ------------------------------------------
+--- a/cmake/Modules/FindGMP.cmake
++++ /dev/null
+@@ -1,48 +0,0 @@
+-#-- GMP finder
+-#
+-# search variables :
+-#     GMP_DIR(cmake/environment) : gmp install directory
+-#     GMP_INCLUDE_DIR(cmake) : directory containing gmp.h      
+-#     GMP_LIBRARY_DIR(cmake) : directory containing gmp libraries
+-#
+-# find options :
+-#     GMP_ENABLE_CXX : search for gmpxx library?
+-#
+-# defined variables :
+-#     GMP_FOUND : true if library found
+-#     GMP_INCLUDE_DIRS : full path to gmp libraries
+-#     GMP_LIBRARIES : full path to gmp libraries
+-#
+-
+-option( GMP_ENABLE_CXX "enable cxx library" OFF )
+-
+-find_path(GMP_INCLUDE_DIRS gmp.h
+-    HINTS $ENV{GMP_DIR} ${GMP_DIR} ${GMP_INCLUDE_DIRS}
+-    PATH_SUFFIXES include
+-)
+-
+-find_library(GMP_LIBRARY NAMES gmp gmp-10 
+-	HINTS $ENV{GMP_DIR} ${GMP_DIR}
+-	PATH_SUFFIXES lib
+-)
+-set( GMP_LIBRARIES ${GMP_LIBRARY} )
+-
+-if( ${GMP_ENABLE_CXX} )
+-	find_library(GMP_CXX_LIBRARY NAMES gmpxx gmpxx-4
+-		HINTS $ENV{GMP_DIR} ${GMP_DIR} 
+-		PATH_SUFFIXES lib
+-	)
+-	set( GMP_LIBRARIES "${GMP_CXX_LIBRARY};${GMP_LIBRARIES}" )
+-endif()
+-
+-# handle the QUIETLY and REQUIRED arguments and set <NAME>_FOUND to TRUE
+-# if all listed variables are TRUE
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(
+-	GMP DEFAULT_MSG
+-    GMP_INCLUDE_DIRS GMP_LIBRARIES
+-)
+-
+-mark_as_advanced(GMP_INCLUDE_DIRS GMP_LIBRARIES)
+-
+-
+--- a/cmake/Modules/FindMPFR.cmake
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#-- MPFR finder
+-#
+-# search variables :
+-#     MPFR_DIR(cmake/environment) : gmp install directory
+-#     MPFR_INCLUDE_DIR(cmake) : directory containing gmp.h      
+-#     MPFR_LIBRARY_DIR(cmake) : directory containing gmp libraries
+-#
+-# defined variables :
+-#     MPFR_FOUND : true if library found
+-#     MPFR_INCLUDE_DIRS : full path to gmp libraries
+-#     MPFR_LIBRARIES : full path to gmp libraries
+-#
+-
+-
+-find_path(MPFR_INCLUDE_DIRS mpfr.h
+-    HINTS $ENV{MPFR_DIR} ${MPFR_DIR}
+-    PATH_SUFFIXES include
+-)
+-
+-find_library(MPFR_LIBRARY NAMES mpfr
+-	HINTS $ENV{MPFR_DIR} ${MPFR_DIR}
+-	PATH_SUFFIXES lib
+-)
+-set( MPFR_LIBRARIES ${MPFR_LIBRARY} )
+-
+-
+-# handle the QUIETLY and REQUIRED arguments and set <NAME>_FOUND to TRUE
+-# if all listed variables are TRUE
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(
+-	MPFR DEFAULT_MSG
+-    MPFR_INCLUDE_DIRS MPFR_LIBRARIES
+-)
+-
+-mark_as_advanced(MPFR_INCLUDE_DIRS MPFR_LIBRARIES )
+-
+-
+--- a/example/CGAL-basic_manip/CMakeLists.txt
++++ b/example/CGAL-basic_manip/CMakeLists.txt
+@@ -2,12 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-	SFCGAL
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+-install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+\ No newline at end of file
++install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-cartesian_kernel/CMakeLists.txt
++++ b/example/CGAL-cartesian_kernel/CMakeLists.txt
+@@ -2,12 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-	SFCGAL
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+-install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+\ No newline at end of file
++install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-point_generator/CMakeLists.txt
++++ b/example/CGAL-point_generator/CMakeLists.txt
+@@ -2,12 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-	SFCGAL
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+-install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+\ No newline at end of file
++install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-polygon_triangulation2/CMakeLists.txt
++++ b/example/CGAL-polygon_triangulation2/CMakeLists.txt
+@@ -2,12 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-	SFCGAL
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+-install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+\ No newline at end of file
++install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/CGAL-triangulation2/CMakeLists.txt
++++ b/example/CGAL-triangulation2/CMakeLists.txt
+@@ -2,12 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-	SFCGAL
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+-install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+\ No newline at end of file
++install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/SFCGAL-building/CMakeLists.txt
++++ b/example/SFCGAL-building/CMakeLists.txt
+@@ -2,13 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-  SFCGAL
+-  SFCGAL-osg
+-  ${CGAL_LIBRARIES}
+-  ${MPFR_LIBRARIES} 
+-  ${GMP_LIBRARIES}
+-  ${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/SFCGAL-export-osg/CMakeLists.txt
++++ b/example/SFCGAL-export-osg/CMakeLists.txt
+@@ -2,14 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME}
+-        SFCGAL
+-        SFCGAL-osg
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${OPENSCENEGRAPH_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/example/SFCGAL-offset/CMakeLists.txt
++++ b/example/SFCGAL-offset/CMakeLists.txt
+@@ -2,12 +2,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${C
+ add_executable( example-${EXAMPLE_NAME} 
+ 	main.cpp 
+ )
+-target_link_libraries( example-${EXAMPLE_NAME} 
+-	SFCGAL
+-	${CGAL_LIBRARIES}
+-	${MPFR_LIBRARIES} 
+-	${GMP_LIBRARIES}
+-	${Boost_LIBRARIES}
+-)
++target_link_libraries( example-${EXAMPLE_NAME} SFCGAL)
+ set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+-install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+\ No newline at end of file
++install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin )
+--- a/src/config.h.cmake
++++ b/src/config.h.cmake
+@@ -23,16 +23,6 @@
+ #include <SFCGAL/export.h>
+ 
+ /**
+- * indicates if GMP is available
+- */
+-#cmakedefine SFCGAL_WITH_GMP
+-/**
+- * indicates if MPFR is available
+- */
+-#cmakedefine SFCGAL_WITH_MPFR
+-
+-
+-/**
+  * indicates if OpenSceneGraph dependency is activated
+  */
+ #cmakedefine SFCGAL_WITH_OSG
+--- a/test/bench/CMakeLists.txt
++++ b/test/bench/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ file( GLOB SFCGAL_BENCHS_SOURCES *.cpp )
+ add_executable( bench-SFCGAL ${SFCGAL_BENCHS_SOURCES} )
+ target_link_libraries( bench-SFCGAL SFCGAL)
+-if( SFCGAL_WITH_MPFR )
+-	target_link_libraries( bench-SFCGAL ${MPFR_LIBRARIES} ${GMP_LIBRARIES} )
+-endif()
+ set_target_properties( bench-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS bench-SFCGAL DESTINATION bin )
+ 


=====================================
debian/patches/fix-linking-with-CGAL-and-CGAL-dependencies.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix-linking-with-CGAL-and-CGAL-dependencies.patch
@@ -0,0 +1,136 @@
+Description: fix linking with CGAL and CGAL dependencies
+Author: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot at cgal.org>
+Origin: https://github.com/Oslandia/SFCGAL/pull/163/commits/7320b6c3f04669beda662e879cd511d630559701
+Bug: https://github.com/Oslandia/SFCGAL/pull/163
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
+ 
+ set( SFCGAL_VERSION_MAJOR 1 )
+ set( SFCGAL_VERSION_MINOR 3 )
+-set( SFCGAL_VERSION_PATCH 4 )
++set( SFCGAL_VERSION_PATCH 5 )
+ 
+ set( SFCGAL_VERSION "${SFCGAL_VERSION_MAJOR}.${SFCGAL_VERSION_MINOR}.${SFCGAL_VERSION_PATCH}" )
+ 
+--- a/sfcgal-config.in
++++ b/sfcgal-config.in
+@@ -38,7 +38,7 @@ case $1 in
+ 	echo -I${prefix}/include 
+ 	;;
+     --libs)
+-	echo -L${libdir} -l at SFCGAL_LIB_NAME@ -lCGAL -lCGAL_Core
++	echo -L${libdir} -l at SFCGAL_LIB_NAME@
+ 	;;
+     --ldflags)
+ 	echo -L${libdir}
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -41,14 +41,7 @@ add_dependencies( SFCGAL copy )
+ set_target_properties( SFCGAL PROPERTIES VERSION ${SFCGAL_VERSION}
+                                          SOVERSION ${SFCGAL_VERSION_MAJOR} )
+ 
+-target_link_libraries( SFCGAL ${CGAL_LIBRARIES} )
+-if( ${SFCGAL_WITH_MPFR} )
+-	target_link_libraries( SFCGAL ${MPFR_LIBRARIES} )
+-endif( ${SFCGAL_WITH_MPFR} )
+-
+-if( ${SFCGAL_WITH_GMP} )
+-	target_link_libraries( SFCGAL ${GMP_LIBRARIES} )
+-endif( ${SFCGAL_WITH_GMP} )
++target_link_libraries( SFCGAL CGAL::CGAL CGAL::CGAL_Core)
+ 
+ target_link_libraries( SFCGAL ${Boost_LIBRARIES} )
+ 
+--- a/test/bench/CMakeLists.txt
++++ b/test/bench/CMakeLists.txt
+@@ -1,10 +1,6 @@
+ file( GLOB SFCGAL_BENCHS_SOURCES *.cpp )
+ add_executable( bench-SFCGAL ${SFCGAL_BENCHS_SOURCES} )
+-target_link_libraries( bench-SFCGAL
+-       SFCGAL
+-       ${Boost_LIBRARIES}
+-       ${CGAL_LIBRARIES}
+-)
++target_link_libraries( bench-SFCGAL SFCGAL)
+ if( SFCGAL_WITH_MPFR )
+ 	target_link_libraries( bench-SFCGAL ${MPFR_LIBRARIES} ${GMP_LIBRARIES} )
+ endif()
+--- a/test/garden/CMakeLists.txt
++++ b/test/garden/CMakeLists.txt
+@@ -4,11 +4,7 @@ file( GLOB_RECURSE SFCGAL_REGRESS_GARDEN
+ set( REGRESS_NAME garden-test-SFCGAL )
+ add_executable( ${REGRESS_NAME} ${SFCGAL_REGRESS_GARDEN_TEST_SOURCES} )
+ 
+-target_link_libraries( ${REGRESS_NAME}
+-	SFCGAL
+-        CGAL::CGAL
+-        CGAL::CGAL_Core
+-)
++target_link_libraries( ${REGRESS_NAME} SFCGAL)
+ target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} )
+ 
+ set_target_properties( ${REGRESS_NAME} PROPERTIES DEBUG_POSTFIX "d" )
+--- a/test/regress/convex_hull/CMakeLists.txt
++++ b/test/regress/convex_hull/CMakeLists.txt
+@@ -4,11 +4,7 @@ file( GLOB_RECURSE SFCGAL_REGRESS_CONVEX
+ set( REGRESS_NAME test-regress-convex_hull )
+ add_executable( ${REGRESS_NAME} ${SFCGAL_REGRESS_CONVEX_HULL_TEST_SOURCES} )
+ 
+-target_link_libraries( ${REGRESS_NAME}
+-	SFCGAL
+-        CGAL::CGAL
+-        CGAL::CGAL_Core
+-)
++target_link_libraries( ${REGRESS_NAME} SFCGAL)
+ 
+ target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES} )
+ 
+--- a/test/regress/polygon_triangulator/CMakeLists.txt
++++ b/test/regress/polygon_triangulator/CMakeLists.txt
+@@ -4,11 +4,7 @@ file( GLOB_RECURSE SFCGAL_REGRESS_POLYGO
+ set( REGRESS_NAME test-regress-polygon_triangulator )
+ add_executable( ${REGRESS_NAME} ${SFCGAL_REGRESS_POLYGON_TRIANGULATOR_TEST_SOURCES} )
+ 
+-target_link_libraries( ${REGRESS_NAME}
+-	SFCGAL
+-        CGAL::CGAL
+-        CGAL::CGAL_Core
+-)
++target_link_libraries( ${REGRESS_NAME}	SFCGAL)
+ target_link_libraries( ${REGRESS_NAME} ${CGAL_3RD_PARTY_LIBRARIES})
+ 
+ 
+--- a/test/regress/standalone/CMakeLists.txt
++++ b/test/regress/standalone/CMakeLists.txt
+@@ -2,13 +2,7 @@
+ file( GLOB_RECURSE SFCGAL_REGRESS_STANDALONE_TEST_SOURCES *.cpp )
+ add_executable( standalone-regress-test-SFCGAL ${SFCGAL_REGRESS_STANDALONE_TEST_SOURCES} )
+ 
+-target_link_libraries( standalone-regress-test-SFCGAL 
+-	SFCGAL
+-        CGAL::CGAL
+-        CGAL::CGAL_Core
+-)
+-target_link_libraries( standalone-regress-test-SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} )
+-
++target_link_libraries( standalone-regress-test-SFCGAL SFCGAL)
+ 
+ set_target_properties( standalone-regress-test-SFCGAL PROPERTIES DEBUG_POSTFIX "d" )
+ install( TARGETS standalone-regress-test-SFCGAL DESTINATION bin )
+--- a/test/unit/CMakeLists.txt
++++ b/test/unit/CMakeLists.txt
+@@ -1,11 +1,7 @@
+ #-- build unit tests
+ file( GLOB_RECURSE SFCGAL_UNIT_TEST_SOURCES *.cpp )
+ add_executable( unit-test-SFCGAL ${SFCGAL_UNIT_TEST_SOURCES} )
+-target_link_libraries( unit-test-SFCGAL 
+-	SFCGAL
+-        CGAL::CGAL
+-        CGAL::CGAL_Core
+-)
++target_link_libraries( unit-test-SFCGAL SFCGAL)
+ target_link_libraries(unit-test-SFCGAL ${CGAL_3RD_PARTY_LIBRARIES})
+ 
+ #include( PrecompiledHeader )


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-linking-with-CGAL-and-CGAL-dependencies.patch
+cleanup-links-and-dependencies.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/70829974e4041d18cd42b6c1fdae7d24601e4e55...5411b35fea3abcf4e9eb245ecd35de6219cd5aa4

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/70829974e4041d18cd42b6c1fdae7d24601e4e55...5411b35fea3abcf4e9eb245ecd35de6219cd5aa4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180411/948e98de/attachment-0001.html>

More information about the Pkg-grass-devel mailing list