[142001] trunk/dports/science/ompl
mmoll at macports.org
mmoll at macports.org
Sat Dec 12 03:54:43 PST 2015
Revision: 142001
https://trac.macports.org/changeset/142001
Author: mmoll at macports.org
Date: 2015-11-01 12:47:53 -0800 (Sun, 01 Nov 2015)
Log Message:
-----------
ompl: fix build of +app variant
Modified Paths:
--------------
trunk/dports/science/ompl/Portfile
Added Paths:
-----------
trunk/dports/science/ompl/files/patch-detect-eigen-omplapp.diff
Modified: trunk/dports/science/ompl/Portfile
===================================================================
--- trunk/dports/science/ompl/Portfile 2015-11-01 20:20:12 UTC (rev 142000)
+++ trunk/dports/science/ompl/Portfile 2015-11-01 20:47:53 UTC (rev 142001)
@@ -8,7 +8,7 @@
name ompl
version 1.1.0
-revision 3
+revision 4
categories science
maintainers mmoll
description The Open Motion Planning Library (OMPL)
@@ -68,7 +68,9 @@
}
patchfiles patch-detect-eigen.diff
-if { ![variant_isset app] } {
+if { [variant_isset app] } {
+ patchfiles-append patch-detect-eigen-omplapp.diff
+} else {
patch.pre_args -p1
}
Added: trunk/dports/science/ompl/files/patch-detect-eigen-omplapp.diff
===================================================================
--- trunk/dports/science/ompl/files/patch-detect-eigen-omplapp.diff (rev 0)
+++ trunk/dports/science/ompl/files/patch-detect-eigen-omplapp.diff 2015-11-01 20:47:53 UTC (rev 142001)
@@ -0,0 +1,19 @@
+--- CMakeLists.txt 2015-10-28 20:18:02.000000000 -0500
++++ CMakeLists.txt 2015-11-01 14:42:31.000000000 -0600
+@@ -27,6 +27,7 @@
+ endif (MSVC OR MSVC90 OR MSVC10)
+
+ set(CMAKE_MODULE_PATH
++ "${CMAKE_MODULE_PATH}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules"
+ "${CMAKE_CURRENT_SOURCE_DIR}/ompl/CMakeModules")
+ include(GNUInstallDirs)
+@@ -177,7 +178,7 @@
+
+ if (EIGEN3_FOUND)
+ set(OMPL_HAVE_EIGEN3 1)
+- include_directories("${EIGEN3_INCLUDE_DIRS}")
++ include_directories("${EIGEN3_INCLUDE_DIR}")
+ endif()
+
+ if (FLANN_FOUND)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/1f1a71ac/attachment-0001.html>
More information about the macports-changes
mailing list