Unverified Commit 63865347 authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

sfcgal: 2.0.0 -> 2.1.0 (#413849)

parents eb0a3516 766e53e8
Loading
Loading
Loading
Loading
+0 −48
Original line number Diff line number Diff line
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07a6c2e5..37c33d92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
   set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
 endif()
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 #SET(CMAKE_MACOSX_RPATH ON)
 
@@ -260,6 +260,10 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
 else()
   set( SFCGAL_LIB_NAME "SFCGAL" )
 endif()
+
+if ( UNIX )
+  include(GNUInstallDirs)
+endif()
 #set( SFCGAL_LIB_NAME ${${CMAKE_BUILD_TYPE}
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sfcgal-config.in ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config @ONLY)
 install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config DESTINATION bin )
diff --git a/sfcgal-config.in b/sfcgal-config.in
index a0e992c5..49615c13 100755
--- a/sfcgal-config.in
+++ b/sfcgal-config.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 
 usage()
 {
diff --git a/sfcgal.pc.in b/sfcgal.pc.in
index 968cb407..bf517d02 100644
--- a/sfcgal.pc.in
+++ b/sfcgal.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 includedir=${prefix}/include
 
 Name: sfcgal
+5 −10
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "sfcgal";
  version = "2.0.0";
  version = "2.1.0";

  src = fetchFromGitLab {
    owner = "sfcgal";
    repo = "SFCGAL";
    rev = "refs/tags/v${finalAttrs.version}";
    hash = "sha256-cx0QJCtAPR/WkWPpH+mZvq2803eDT7b+qlI5ma+CveE=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-m8oyfL3rF4qLugoEFa8iiqS5D1Oljg+x1qMp9KfiQ5c=";
  };

  buildInputs = [
@@ -29,17 +29,12 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [ cmake ];

  patches = [
    # https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/384
    ./cmake-fix.patch
  ];

  meta = {
    description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations";
    homepage = "https://sfcgal.gitlab.io/SFCGAL/";
    changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}";
    license = lib.licenses.lgpl2;
    platforms = lib.platforms.linux;
    license = lib.licenses.lgpl2Plus;
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ fqidz ];
    teams = [ lib.teams.geospatial ];
  };