[sfcgal] 02/02: Add patch to remove FindCGAL.cmake, breaks Config mode.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository sfcgal.

commit 6f577f50b0da4856954cbf2905f41197e4c9ae12
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 15 18:58:38 2018 +0100

    Add patch to remove FindCGAL.cmake, breaks Config mode.
---
 debian/changelog                     |   1 +
 debian/patches/remove-findcgal.patch | 101 +++++++++++++++++++++++++++++++++++
 debian/patches/series                |   1 +
 3 files changed, 103 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d889bb8..318d023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ sfcgal (1.3.2-1) UNRELEASED; urgency=medium
   * Update copyright-format URL to use HTTPS.
   * Add patches by Sebastien Loriot to fix FTBFS with CGAL 4.11.
     (closes: #876521)
+  * Add patch to remove FindCGAL.cmake, breaks Config mode.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Sep 2017 20:49:16 +0200
 
diff --git a/debian/patches/remove-findcgal.patch b/debian/patches/remove-findcgal.patch
new file mode 100644
index 0000000..3522640
--- /dev/null
+++ b/debian/patches/remove-findcgal.patch
@@ -0,0 +1,101 @@
+Description: Remove FindCGAL.cmake, breaks Config mode.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/Oslandia/SFCGAL/issues/145
+Bug-Debian: https://bugs.debian.org/876521
+
+--- a/cmake/Modules/FindCGAL.cmake
++++ /dev/null
+@@ -1,93 +0,0 @@
+-find_path(CGAL_INCLUDE_DIRS CGAL/gmp.h
+-    HINTS $ENV{CGAL_DIR}/include ${CGAL_DIR}/include ${CGAL_INCLUDE_DIRS}
+-    PATH_SUFFIXES CGAL
+-)
+-
+-if( MSVC10)
+-	set( CGAL_LIBRARY_POSTFIX "-vc100-mt-${CGAL_VERSION}" )
+-	set( CGAL_LIBRARY_POSTFIX_DEBUG "-vc100-mt-gd-${CGAL_VERSION}" )
+-else()
+-	set( CGAL_LIBRARY_POSTFIX "")
+-	set( CGAL_LIBRARY_POSTFIX_DEBUG "d")
+-endif()
+-
+-#-- incidates if debug version are found
+-set( CGAL_DEBUG_FOUND ON )
+-
+-
+-#-- find CGAL library
+-find_library( CGAL_LIBRARY "CGAL${CGAL_LIBRARY_POSTFIX}" ${CGAL_LIBRARY}
+-	HINTS ${CGAL_LIBRARY_DIRS} $ENV{CGAL_DIR}/lib
+-)
+-if( CGAL_LIBRARY )
+-	get_filename_component(CGAL_LIBRARY_DIRS ${CGAL_LIBRARY} PATH)
+-endif()
+-
+-if(CGAL_FIND_VERSION)
+-    message("CGAL_DIR ${CGAL_DIR}")
+-    find_file(version_file version.h HINTS $ENV{CGAL_DIR}/include ${CGAL_DIR}/include ${CGAL_INCLUDE_DIRS} PATH_SUFFIXES CGAL)
+-    file(STRINGS ${version_file} version_str REGEX "# *define +CGAL_VERSION +")
+-    string( REGEX REPLACE "# *define +CGAL_VERSION +" "" CGAL_VERSION ${version_str})
+-    if("${CGAL_VERSION}" VERSION_LESS "${CGAL_FIND_VERSION}")
+-        message(FATAL_ERROR "CGAL " ${CGAL_FIND_VERSION} " is required (found " ${CGAL_VERSION} " in ${version_file})" )
+-    endif()
+-
+-endif()
+-
+-find_library( CGAL_LIBRARY_DEBUG "CGAL${CGAL_LIBRARY_POSTFIX_DEBUG}" ${CGAL_LIBRARY_DEBUG}
+-	HINTS ${CGAL_LIBRARY_DIRS}
+-)
+-if( NOT CGAL_LIBRARY_DEBUG )
+-	set( CGAL_DEBUG_FOUND OFF )
+-endif()
+-
+-#-- CGAL components (Core, ImageIO)
+-foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} )
+-	#-- find release
+-	find_library( CGAL_${CGAL_COMPONENT}_LIBRARY "CGAL_${CGAL_COMPONENT}${CGAL_LIBRARY_POSTFIX}" "${CGAL_${CGAL_COMPONENT}_LIBRARY}"
+-		HINTS ${CGAL_LIBRARY_DIRS} $ENV{CGAL_DIR}/lib
+-	)
+-	#-- find debug
+-	find_library( CGAL_${CGAL_COMPONENT}_LIBRARY_DEBUG "CGAL_${CGAL_COMPONENT}${CGAL_LIBRARY_POSTFIX_DEBUG}" "${CGAL_${CGAL_COMPONENT}_LIBRARY_DEBUG}"
+-		HINTS ${CGAL_LIBRARY_DIRS} $ENV{CGAL_DIR}/lib
+-	)
+-	
+-	if( NOT CGAL_${CGAL_COMPONENT}_LIBRARY_DEBUG )
+-		set( CGAL_DEBUG_FOUND OFF )
+-	endif()
+-endforeach()
+- 
+-
+-#-- build variable CGAL_LIBRARIES
+-
+-set( CGAL_LIBRARIES "" )
+-if( ${CGAL_DEBUG_FOUND} )
+-	list( APPEND CGAL_LIBRARIES optimized ${CGAL_LIBRARY} debug ${CGAL_LIBRARY_DEBUG} )
+-	foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} )
+-		list( APPEND CGAL_LIBRARIES optimized "${CGAL_${CGAL_COMPONENT}_LIBRARY}" debug "${CGAL_${CGAL_COMPONENT}_LIBRARY_DEBUG}" )
+-	endforeach()
+-else()
+-	list( APPEND CGAL_LIBRARIES ${CGAL_LIBRARY} )
+-	foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} )
+-		list( APPEND CGAL_LIBRARIES ${CGAL_${CGAL_COMPONENT}_LIBRARY} )
+-	endforeach()
+-endif()
+-
+-#-- report/validate
+-set( CGAL_COMPONENT_LIBRARIES "" )
+-set( CGAL_COMPONENT_LIBRARIES_DEBUG "" )
+-foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} )
+-	list( APPEND CGAL_COMPONENT_LIBRARIES CGAL_${CGAL_COMPONENT}_LIBRARY )
+-	list( APPEND CGAL_COMPONENT_LIBRARIES_DEBUG CGAL_${CGAL_COMPONENT}_LIBRARY_DEBUG )
+-endforeach()
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(
+-	CGAL DEFAULT_MSG
+-	CGAL_INCLUDE_DIRS CGAL_LIBRARIES ${CGAL_COMPONENT_LIBRARIES}
+-)
+-
+-mark_as_advanced( CGAL_LIBRARY_DIRS CGAL_LIBRARY_DEBUG ${CGAL_COMPONENT_LIBRARIES_DEBUG} )
+-
+-
+-
diff --git a/debian/patches/series b/debian/patches/series
index 471350a..3e5440e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ no-matching-function-call.patch
 Compatibility-with-gmpxx.patch
 fix-gmpxx-compatibility-in-tests.patch
 update-cmake-scripts.patch
+remove-findcgal.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git