<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141892] trunk/dports/science/ompl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141892">141892</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2015-10-30 13:50:06 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ompl: correctly detect eigen3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceomplPortfile">trunk/dports/science/ompl/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceomplfilespatchdetecteigendiff">trunk/dports/science/ompl/files/patch-detect-eigen.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceomplfilespatchCMakeModulesPythonBindingUtilscmakediff">trunk/dports/science/ompl/files/patch-CMakeModules-PythonBindingUtils-cmake.diff</a></li>
<li><a href="#trunkdportsscienceomplfilespatchpybindingsbindings_generatorpyindiff">trunk/dports/science/ompl/files/patch-py-bindings-bindings_generator-py-in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceomplPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ompl/Portfile (141891 => 141892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ompl/Portfile 2015-10-30 20:18:16 UTC (rev 141891)
+++ trunk/dports/science/ompl/Portfile 2015-10-30 20:50:06 UTC (rev 141892)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> name ompl
</span><span class="cx"> version 1.1.0
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories science
</span><span class="cx"> maintainers mmoll
</span><span class="cx"> description The Open Motion Planning Library (OMPL)
</span><span class="lines">@@ -67,8 +67,7 @@
</span><span class="cx"> "
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-CMakeModules-PythonBindingUtils-cmake.diff \
- patch-py-bindings-bindings_generator-py-in.diff
</del><ins>+patchfiles patch-detect-eigen.diff
</ins><span class="cx"> if { ![variant_isset app] } {
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsscienceomplfilespatchCMakeModulesPythonBindingUtilscmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/ompl/files/patch-CMakeModules-PythonBindingUtils-cmake.diff (141891 => 141892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ompl/files/patch-CMakeModules-PythonBindingUtils-cmake.diff 2015-10-30 20:18:16 UTC (rev 141891)
+++ trunk/dports/science/ompl/files/patch-CMakeModules-PythonBindingUtils-cmake.diff 2015-10-30 20:50:06 UTC (rev 141892)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-diff -r 72ff4ee4fea6 CMakeModules/PythonBindingsUtils.cmake
---- ompl/CMakeModules/PythonBindingsUtils.cmake Wed Oct 28 20:04:41 2015 -0500
-+++ ompl/CMakeModules/PythonBindingsUtils.cmake Thu Oct 29 09:59:21 2015 -0500
-@@ -80,7 +80,7 @@
- PYTHONPATH="${PROJECT_BINARY_DIR}/pyplusplus/lib/python${PYTHON_VERSION}/site-packages:$ENV{PYTHONPATH}"
- ${PYTHON_EXEC}
- "${CMAKE_CURRENT_SOURCE_DIR}/generate_bindings.py" "${module}"
-- "1>${CMAKE_BINARY_DIR}/pyplusplus_${module}.log" "2>&1"
-+ "|tee" "${CMAKE_BINARY_DIR}/pyplusplus_${module}.log" "2>&1"
- COMMAND ${CMAKE_COMMAND} -D "PATH=${dir}/bindings/${module}"
- -P "${OMPL_CMAKE_UTIL_DIR}/workaround_for_gccxml_bug.cmake"
- COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR}
</del></span></pre></div>
<a id="trunkdportsscienceomplfilespatchdetecteigendiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ompl/files/patch-detect-eigen.diff (0 => 141892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ompl/files/patch-detect-eigen.diff (rev 0)
+++ trunk/dports/science/ompl/files/patch-detect-eigen.diff 2015-10-30 20:50:06 UTC (rev 141892)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+diff -r 72ff4ee4fea6 CMakeLists.txt
+--- ompl/CMakeLists.txt Wed Oct 28 20:04:41 2015 -0500
++++ ompl/CMakeLists.txt Fri Oct 30 15:48:19 2015 -0500
+@@ -23,7 +23,8 @@
+ set(MSVC ON)
+ endif (MSVC OR MSVC90 OR MSVC10)
+
+-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
++set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
++message(${CMAKE_MODULE_PATH})
+ include(GNUInstallDirs)
+ include(CompilerSettings)
+ include(OMPLVersion)
+@@ -112,7 +113,7 @@
+ find_package(Eigen3 QUIET)
+ if (EIGEN3_FOUND)
+ set(OMPL_HAVE_EIGEN3 1)
+- include_directories("${EIGEN3_INCLUDE_DIRS}")
++ include_directories("${EIGEN3_INCLUDE_DIR}")
+ endif()
+
+ # MORSE is only needed for Modular OpenRobots Simulation Engine bindings
+diff -r 72ff4ee4fea6 CMakeModules/FindEigen3.cmake
+--- ompl/CMakeModules/FindEigen3.cmake Wed Oct 28 20:04:41 2015 -0500
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,8 +0,0 @@
+-include(FindPackageHandleStandardArgs)
+-
+-find_package(PkgConfig)
+-if(PKG_CONFIG_FOUND)
+- pkg_check_modules(EIGEN3 eigen3)
+-endif()
+-
+-find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIRS)
+diff -r 72ff4ee4fea6 CMakeModules/PythonBindingsUtils.cmake
+--- ompl/CMakeModules/PythonBindingsUtils.cmake Wed Oct 28 20:04:41 2015 -0500
++++ ompl/CMakeModules/PythonBindingsUtils.cmake Fri Oct 30 15:48:19 2015 -0500
+@@ -80,7 +80,7 @@
+ PYTHONPATH="${PROJECT_BINARY_DIR}/pyplusplus/lib/python${PYTHON_VERSION}/site-packages:$ENV{PYTHONPATH}"
+ ${PYTHON_EXEC}
+ "${CMAKE_CURRENT_SOURCE_DIR}/generate_bindings.py" "${module}"
+- "1>${CMAKE_BINARY_DIR}/pyplusplus_${module}.log" "2>&1"
++ "|tee" "${CMAKE_BINARY_DIR}/pyplusplus_${module}.log" "2>&1"
+ COMMAND ${CMAKE_COMMAND} -D "PATH=${dir}/bindings/${module}"
+ -P "${OMPL_CMAKE_UTIL_DIR}/workaround_for_gccxml_bug.cmake"
+ COMMAND ${CMAKE_COMMAND} ${CMAKE_BINARY_DIR}
+diff -r 72ff4ee4fea6 py-bindings/bindings_generator.py.in
+--- ompl/py-bindings/bindings_generator.py.in Wed Oct 28 20:04:41 2015 -0500
++++ ompl/py-bindings/bindings_generator.py.in Fri Oct 30 15:48:19 2015 -0500
+@@ -112,7 +112,7 @@
+ @dep name of another module this module depends on"""
+ module_builder.set_logger_level( logging.INFO )
+ candidate_include_paths = [ "@OMPL_INCLUDE_DIR@", "@OMPLAPP_INCLUDE_DIR@",
+- "@PYTHON_INCLUDE_DIRS@", "@Boost_INCLUDE_DIR@", "@ASSIMP_INCLUDE_DIRS@", "@ODEINT_INCLUDE_DIR@", "@Eigen_INCLUDE_DIRS@"]
++ "@PYTHON_INCLUDE_DIRS@", "@Boost_INCLUDE_DIR@", "@ASSIMP_INCLUDE_DIRS@", "@ODEINT_INCLUDE_DIR@", "@EIGEN3_INCLUDE_DIR@"]
+
+ # Adding standard windows headers
+ if platform == 'win32':
</ins></span></pre></div>
<a id="trunkdportsscienceomplfilespatchpybindingsbindings_generatorpyindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/ompl/files/patch-py-bindings-bindings_generator-py-in.diff (141891 => 141892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ompl/files/patch-py-bindings-bindings_generator-py-in.diff 2015-10-30 20:18:16 UTC (rev 141891)
+++ trunk/dports/science/ompl/files/patch-py-bindings-bindings_generator-py-in.diff 2015-10-30 20:50:06 UTC (rev 141892)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-diff -r 72ff4ee4fea6 py-bindings/bindings_generator.py.in
---- ompl/py-bindings/bindings_generator.py.in Wed Oct 28 20:04:41 2015 -0500
-+++ ompl/py-bindings/bindings_generator.py.in Fri Oct 30 08:28:09 2015 -0500
-@@ -39,7 +39,7 @@
- # coding: utf-8
-
- import logging
--from os.path import exists, join, isdir
-+from os.path import exists, join, isdir, abspath
- from os import getenv
- import subprocess
- from sys import platform
-@@ -112,7 +112,7 @@
- @dep name of another module this module depends on"""
- module_builder.set_logger_level( logging.INFO )
- candidate_include_paths = [ "@OMPL_INCLUDE_DIR@", "@OMPLAPP_INCLUDE_DIR@",
-- "@PYTHON_INCLUDE_DIRS@", "@Boost_INCLUDE_DIR@", "@ASSIMP_INCLUDE_DIRS@", "@ODEINT_INCLUDE_DIR@", "@Eigen_INCLUDE_DIRS@"]
-+ "@PYTHON_INCLUDE_DIRS@", "@Boost_INCLUDE_DIR@", "@ASSIMP_INCLUDE_DIRS@", "@ODEINT_INCLUDE_DIR@", "@EIGEN3_INCLUDE_DIRS@"]
-
- # Adding standard windows headers
- if platform == 'win32':
-@@ -155,7 +155,7 @@
- self.filter_declarations()
- if deps!=None:
- for dep in deps:
-- self.mb.register_module_dependency(dep)
-+ self.mb.register_module_dependency(abspath(dep))
- self.mb.build_code_creator( module_name='_'+name )
- self.mb.split_module('bindings/' + name, use_files_sum_repository=True)
-
</del></span></pre>
</div>
</div>
</body>
</html>