[121335] trunk/dports/math/gnudatalanguage

[takeshi at macports.org]

Revision: 121335
          https://trac.macports.org/changeset/121335
Author:   takeshi at macports.org
Date:     2014-06-23 13:40:34 -0700 (Mon, 23 Jun 2014)
Log Message:
-----------
gnudatalanguage: added a patch to CMakeLists.txt not to create a symlink to the binary gdl, closing #44105

Modified Paths:
--------------
    trunk/dports/math/gnudatalanguage/Portfile

Added Paths:
-----------
    trunk/dports/math/gnudatalanguage/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2014-06-23 20:27:13 UTC (rev 121334)
+++ trunk/dports/math/gnudatalanguage/Portfile	2014-06-23 20:40:34 UTC (rev 121335)
@@ -60,7 +60,8 @@
 conflicts_build             antlr
 
 patchfiles                  patch-src-gsl_fun.cpp.diff \
-                            patch-src-gdlgstream.hpp.diff
+                            patch-src-gdlgstream.hpp.diff \
+                            patch-CMakeLists.txt.diff
 
 post-patch {
    # Avoid using heimdal's broken fnmatch.h
@@ -71,11 +72,15 @@
 configure.args-append   -DEIGEN3DIR=${prefix} \
                         -DFFTW=ON \
                         -DFFTWDIR=${prefix} \
-                        -DGRAPHICSMAGICK=${prefix} \
+                        -DGRAPHICSMAGICK=ON \
+                        -DGRAPHICSMAGICKDIR=${prefix} \
+                        -DGRAPHICSMAGICK_INCLUDE_DIR=${prefix}/include/GraphicsMagick \
                         -DGRIB=ON \
                         -DGRIBDIR=${prefix} \
+                        -DGRIB_INCLUDE_DIR=${prefix}/include \
                         -DGSHHS=OFF \
                         -DGSLDIR=${prefix} \
+                        -DGSL_INCLUDE_DIR=${prefix}/include \
                         -DHDF5=ON \
                         -DHDF5DIR=${prefix} \
                         -DHDF=ON \

Added: trunk/dports/math/gnudatalanguage/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/math/gnudatalanguage/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/math/gnudatalanguage/files/patch-CMakeLists.txt.diff	2014-06-23 20:40:34 UTC (rev 121335)
@@ -0,0 +1,25 @@
+--- CMakeLists.txt.orig	2013-09-29 00:03:32.000000000 +0900
++++ CMakeLists.txt	2014-06-24 05:26:34.000000000 +0900
+@@ -759,14 +759,14 @@
+ 
+ # create a link src/gdl -> ${BUILD}/.../gdl
+ # for windows, just copy the file
+-if(NOT PYTHON_MODULE)
+-	get_target_property(GDLLOCATION gdl LOCATION)
+-	if(WIN32)
+-	add_custom_target(copy_gdl ALL ${CMAKE_COMMAND} -E copy ${GDLLOCATION} ${CMAKE_SOURCE_DIR}/src/gdl DEPENDS gdl)
+-	else(WIN32)
+-	add_custom_target(symlink_gdl ALL ${CMAKE_COMMAND} -E create_symlink ${GDLLOCATION} ${CMAKE_SOURCE_DIR}/src/gdl DEPENDS gdl)
+-	endif(WIN32)
+-endif(NOT PYTHON_MODULE)
++#if(NOT PYTHON_MODULE)
++#	get_target_property(GDLLOCATION gdl LOCATION)
++#	if(WIN32)
++#	add_custom_target(copy_gdl ALL ${CMAKE_COMMAND} -E copy ${GDLLOCATION} ${CMAKE_SOURCE_DIR}/src/gdl DEPENDS gdl)
++#	else(WIN32)
++#	add_custom_target(symlink_gdl ALL ${CMAKE_COMMAND} -E create_symlink ${GDLLOCATION} ${CMAKE_SOURCE_DIR}/src/gdl DEPENDS gdl)
++#	endif(WIN32)
++#endif(NOT PYTHON_MODULE)
+ 
+ # display macro
+ macro(MODULE MOD NAME)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140623/43bfdb52/attachment.html>