Changeset 87107 for trunk/dports/gis


Ignore:
Timestamp:
Nov 10, 2011, 8:17:22 PM (8 years ago)
Author:
ryandesign@…
Message:

cgal: update to 3.9, use gcc-4.2 instead of 4.0 and when demos variant is being used; see #31562

Location:
trunk/dports/gis/cgal
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gis/cgal/Portfile

    r78082 r87107  
    66
    77name                            cgal
    8 version                         3.8
     8version                         3.9
    99license                         LGPL-2.1 QPL Commercial
    1010categories                      gis science
     
    2525
    2626fetch.ignore_sslcert    yes
    27 master_sites            https://gforge.inria.fr/frs/download.php/28500/
     27master_sites            https://gforge.inria.fr/frs/download.php/29125/
    2828
    2929distname                        CGAL-${version}
    30 checksums           md5     b8a79e62e4d8ba8b649d815aebbd1c0a \
    31                     sha1    23748df1e60d62da166d2e395732ae2fe274317d \
    32                     rmd160  5e5e1323ae453d928e85b4f6a7647f9d6d2973d0
     30checksums           rmd160  0a5a929ecedeeac3833ec90f802b7f5ac069ad47 \
     31                    sha256  241194ad9487d62d1287f863eab3adbbfd0836e2bebcd50c9fc21d473f947ba4
    3332
    3433depends_lib-append      port:boost \
     
    3635                                        port:zlib \
    3736                                        port:gmp
     37
     38configure.args-append   -DCGAL_INSTALL_CMAKE_DIR="${prefix}/lib/cmake"
     39
     40# gcc 4.0 is too old to compile CGAL properly; see <http://www.cgal.org/FAQ.html#mac_optimization_bug>
     41# And the demos don't compile with llvm-gcc-4.2 or clang
     42if {${configure.compiler} == "gcc-4.0" || [variant_isset demos]} {
     43    configure.compiler gcc-4.2
     44    if {![file executable ${configure.cc}]} {
     45        depends_build-append port:apple-gcc42
     46        configure.compiler apple-gcc-4.2
     47        # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     48        configure.cxx ${prefix}/bin/g++-apple-4.2
     49    }
     50}
    3851
    3952variant demos description {Create demos} {
  • trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff

    r78082 r87107  
    1 --- demo/Polyhedron/CMakeLists.txt.orig 2011-04-20 17:50:55.000000000 +0200
    2 +++ demo/Polyhedron/CMakeLists.txt      2011-04-20 17:52:42.000000000 +0200
     1--- demo/Mesh_3/CMakeLists.txt.orig     2011-09-05 15:47:29.000000000 +0200
     2+++ demo/Mesh_3/CMakeLists.txt  2011-09-29 16:51:17.000000000 +0200
    33@@ -202,7 +202,7 @@
    44     else()
     
    1010 
    1111     add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
    12 --- demo/Mesh_3/CMakeLists.txt.orig     2011-01-10 21:00:21.000000000 +0100
    13 +++ demo/Mesh_3/CMakeLists.txt  2011-04-20 17:52:42.000000000 +0200
    14 @@ -198,7 +198,7 @@
     12--- demo/Mesh_3/implicit_functions/CMakeLists.txt.orig  2011-09-05 15:47:29.000000000 +0200
     13+++ demo/Mesh_3/implicit_functions/CMakeLists.txt       2011-09-29 16:51:17.000000000 +0200
     14@@ -51,7 +51,7 @@
    1515     else()
    1616       set(other_sources ${ARGN_TAIL})
     
    2121 
    2222     add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
    23 --- demo/Mesh_3/implicit_functions/CMakeLists.txt.orig  2011-04-20 17:51:34.000000000 +0200
    24 +++ demo/Mesh_3/implicit_functions/CMakeLists.txt       2011-04-20 17:52:42.000000000 +0200
    25 @@ -47,7 +47,7 @@
     23--- demo/Surface_reconstruction_points_3/CMakeLists.txt.orig    2011-09-05 15:47:56.000000000 +0200
     24+++ demo/Surface_reconstruction_points_3/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
     25@@ -219,7 +219,7 @@
    2626     else()
    2727       set(other_sources ${ARGN_TAIL})
     
    3232 
    3333     add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
    34 --- demo/Surface_reconstruction_points_3/CMakeLists.txt.orig    2011-04-20 17:51:49.000000000 +0200
    35 +++ demo/Surface_reconstruction_points_3/CMakeLists.txt 2011-04-20 17:52:42.000000000 +0200
    36 @@ -218,7 +218,7 @@
    37      else()
    38        set(other_sources ${ARGN_TAIL})
    39      endif()
    40 -    qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
    41 +    qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
    42      add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
    43  
    44      add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
Note: See TracChangeset for help on using the changeset viewer.