[141892] trunk/dports/science/ompl
mmoll at macports.org
mmoll at macports.org
Sat Dec 12 03:27:04 PST 2015
Revision: 141892
https://trac.macports.org/changeset/141892
Author: mmoll at macports.org
Date: 2015-10-30 13:50:06 -0700 (Fri, 30 Oct 2015)
Log Message:
-----------
ompl: correctly detect eigen3
Modified Paths:
--------------
trunk/dports/science/ompl/Portfile
Added Paths:
-----------
trunk/dports/science/ompl/files/patch-detect-eigen.diff
Removed Paths:
-------------
trunk/dports/science/ompl/files/patch-CMakeModules-PythonBindingUtils-cmake.diff
trunk/dports/science/ompl/files/patch-py-bindings-bindings_generator-py-in.diff
Modified: trunk/dports/science/ompl/Portfile
===================================================================
--- 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)
@@ -8,7 +8,7 @@
name ompl
version 1.1.0
-revision 2
+revision 3
categories science
maintainers mmoll
description The Open Motion Planning Library (OMPL)
@@ -67,8 +67,7 @@
"
}
-patchfiles patch-CMakeModules-PythonBindingUtils-cmake.diff \
- patch-py-bindings-bindings_generator-py-in.diff
+patchfiles patch-detect-eigen.diff
if { ![variant_isset app] } {
patch.pre_args -p1
}
Deleted: trunk/dports/science/ompl/files/patch-CMakeModules-PythonBindingUtils-cmake.diff
===================================================================
--- 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)
@@ -1,12 +0,0 @@
-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}
Added: trunk/dports/science/ompl/files/patch-detect-eigen.diff
===================================================================
--- 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)
@@ -0,0 +1,58 @@
+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':
Deleted: trunk/dports/science/ompl/files/patch-py-bindings-bindings_generator-py-in.diff
===================================================================
--- 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)
@@ -1,30 +0,0 @@
-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)
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/a7b5649c/attachment-0001.html>
More information about the macports-changes
mailing list