[130957] trunk/dports/gis/cgal
sean at macports.org
sean at macports.org
Sat Jan 3 22:56:07 PST 2015
Revision: 130957
https://trac.macports.org/changeset/130957
Author: sean at macports.org
Date: 2015-01-03 22:56:07 -0800 (Sat, 03 Jan 2015)
Log Message:
-----------
cgal: remove demo variant; closes #44727
This variant hasn't worked correctly for a long time now. With newer versions
of cgal, it has been impossible to even build correctly. The design of the cgal
examples and demos now has a meaning of "install cgal first, then extract the
demos somewhere and run those separate." Therefore, we just remove the useless
variant.
Modified Paths:
--------------
trunk/dports/gis/cgal/Portfile
Removed Paths:
-------------
trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/gis/cgal/Portfile
===================================================================
--- trunk/dports/gis/cgal/Portfile 2015-01-04 06:01:11 UTC (rev 130956)
+++ trunk/dports/gis/cgal/Portfile 2015-01-04 06:56:07 UTC (rev 130957)
@@ -54,49 +54,6 @@
configure.optflags -O3 -pipe -march=native
}
-variant demos description {Create demos} requires qt4 {
- depends_lib-append port:libQGLViewer \
- port:ipe \
- port:metis \
- port:qt4-mac-sqlite3-plugin
-
- patchfiles-append patch-CMakeLists.txt.diff
-
- configure.args-append -DWITH_examples:BOOL=ON
- configure.args-append -DWITH_demos:BOOL=ON
- configure.args-append -DWITH_QGLViewer:BOOL=ON
- configure.args-append -DWITH_OpenGL:BOOL=ON
-
- # MacPorts installs IPE version 7; make sure to use it.
- configure.args-append -DWITH_IPE:BOOL=ON
-
- # include Qt's CMake defines, just in case
- configure.args-append ${qt_cmake_defines}
-
- post-configure {
- # Workaround a bug in the link.txt files of the ipelets demos
- set ipelink [glob ${worksrcpath}/demo/CGAL_ipelets/CMakeFiles/*/link.txt]
- foreach linkfile ${ipelink} {
- reinplace -E "s|(.*)|\\1 -lipe|" ${linkfile}
- }
- }
-
- build.target-append examples demos
- use_parallel_build no
-
- post-destroot {
- xinstall -d ${destroot}${prefix}/share/${name}
- copy ${worksrcpath}/demo ${destroot}${prefix}/share/${name}
- copy ${worksrcpath}/examples ${destroot}${prefix}/share/${name}
- eval move [glob ${destroot}${prefix}/share/${name}/demo/*/*.dylib] ${destroot}${prefix}/lib/
- delete ${destroot}${prefix}/share/${name}/demo/CMakeFiles \
- ${destroot}${prefix}/share/${name}/examples/CMakeFiles
- eval delete [glob ${destroot}${prefix}/share/${name}/demo/*/CMakeFiles]
- eval delete [glob ${destroot}${prefix}/share/${name}/demo/*/*/CMakeFiles]
- eval delete [glob ${destroot}${prefix}/share/${name}/examples/*/CMakeFiles]
- }
-}
-
variant debug description {Build with debug symbols} {
configure.args-delete -DCMAKE_BUILD_TYPE=Release
configure.args-append -DCMAKE_BUILD_TYPE=Debug
Deleted: trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff 2015-01-04 06:01:11 UTC (rev 130956)
+++ trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff 2015-01-04 06:56:07 UTC (rev 130957)
@@ -1,33 +0,0 @@
---- demo/Mesh_3/CMakeLists.txt.orig 2011-09-05 15:47:29.000000000 +0200
-+++ demo/Mesh_3/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
-@@ -202,7 +202,7 @@
- else()
- set(other_sources ${ARGN_TAIL})
- endif()
-- qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+ qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
- add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
-
- add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Mesh_3/implicit_functions/CMakeLists.txt.orig 2011-09-05 15:47:29.000000000 +0200
-+++ demo/Mesh_3/implicit_functions/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
-@@ -51,7 +51,7 @@
- else()
- set(other_sources ${ARGN_TAIL})
- endif()
-- qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+ qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
- add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
-
- add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Surface_reconstruction_points_3/CMakeLists.txt.orig 2011-09-05 15:47:56.000000000 +0200
-+++ demo/Surface_reconstruction_points_3/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
-@@ -219,7 +219,7 @@
- else()
- set(other_sources ${ARGN_TAIL})
- endif()
-- qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+ qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
- add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
-
- add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150103/3896310f/attachment.html>
More information about the macports-changes
mailing list