summaryrefslogtreecommitdiff
path: root/misc/ompl/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/ompl/files')
-rw-r--r--misc/ompl/files/patch-CMakeLists.txt37
-rw-r--r--misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake26
-rw-r--r--misc/ompl/files/patch-src_ompl_tools_benchmark_src_MachineSpecs.cpp10
3 files changed, 73 insertions, 0 deletions
diff --git a/misc/ompl/files/patch-CMakeLists.txt b/misc/ompl/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..2e295a58df47
--- /dev/null
+++ b/misc/ompl/files/patch-CMakeLists.txt
@@ -0,0 +1,37 @@
+--- CMakeLists.txt.orig 2018-06-24 21:58:25 UTC
++++ CMakeLists.txt
+@@ -97,8 +97,8 @@ enable_testing()
+ set_package_properties(Python PROPERTIES
+ URL "http://python.org"
+ PURPOSE "Used for python bindings.")
+-find_package(Python QUIET)
+-find_boost_python()
++#find_package(Python QUIET)
++#find_boost_python()
+
+ if(PYTHON_FOUND)
+ set_package_properties(pypy PROPERTIES
+@@ -151,7 +151,7 @@ endif()
+ set_package_properties(spot PROPERTIES
+ URL "http://spot.lrde.epita.fr"
+ PURPOSE "Used for constructing finite automata from LTL formulae.")
+-find_package(spot)
++#find_package(spot)
+ if (SPOT_FOUND)
+ set(OMPL_HAVE_SPOT 1)
+ include_directories("${SPOT_INCLUDE_DIRS}")
+@@ -171,12 +171,12 @@ if(PYTHON_FOUND AND NOT Boost_VERSION VE
+ endif()
+
+ # R is needed for running Planner Arena locally
+-find_program(R_EXEC R)
++#find_program(R_EXEC R)
+
+ add_subdirectory(py-bindings)
+ add_subdirectory(src)
+ add_subdirectory(tests)
+-add_subdirectory(demos)
++#add_subdirectory(demos)
+ add_subdirectory(scripts)
+ add_subdirectory(doc)
+
diff --git a/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake b/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake
new file mode 100644
index 000000000000..3ade08453ab2
--- /dev/null
+++ b/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake
@@ -0,0 +1,26 @@
+--- CMakeModules/CompilerSettings.cmake.orig 2018-08-04 19:52:03 UTC
++++ CMakeModules/CompilerSettings.cmake
+@@ -21,12 +21,12 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ -Wno-noexcept-type
+ -Wno-deprecated-declarations)
+ # prepend optimizion flag (in case the default setting doesn't include one)
+- set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+ endif(CMAKE_COMPILER_IS_GNUCXX)
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ add_definitions(-W -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-unused-parameter -Wno-delete-non-virtual-dtor -Wno-overloaded-virtual -Wno-unknown-pragmas -Qunused-arguments -Wno-deprecated-register -Wno-mismatched-tags -Wno-deprecated-declarations)
+ # prepend optimizion flag (in case the default setting doesn't include one)
+- set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+ endif()
+
+ if(MSVC OR MSVC90 OR MSVC10)
+@@ -42,7 +42,7 @@ if(IS_ICPC)
+ add_definitions(-wd191 -wd411 -wd654 -wd1125 -wd1292 -wd1565 -wd1628 -wd2196)
+ set(CMAKE_AR "xiar" CACHE STRING "Intel archiver" FORCE)
+ set(CMAKE_CXX_FLAGS "-pthread" CACHE STRING "Default compile flags" FORCE)
+- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG"
++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG"
+ CACHE STRING "Flags used by the C++ compiler during release builds." FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING
+ "Flags used by the C++ compiler during debug builds." FORCE)
diff --git a/misc/ompl/files/patch-src_ompl_tools_benchmark_src_MachineSpecs.cpp b/misc/ompl/files/patch-src_ompl_tools_benchmark_src_MachineSpecs.cpp
new file mode 100644
index 000000000000..60f18ef68692
--- /dev/null
+++ b/misc/ompl/files/patch-src_ompl_tools_benchmark_src_MachineSpecs.cpp
@@ -0,0 +1,10 @@
+--- src/ompl/tools/benchmark/src/MachineSpecs.cpp.orig 2018-08-04 18:25:01 UTC
++++ src/ompl/tools/benchmark/src/MachineSpecs.cpp
+@@ -37,6 +37,7 @@
+ #include "ompl/tools/benchmark/MachineSpecs.h"
+ #include "ompl/util/Console.h"
+ #include <sstream>
++#include <unistd.h>
+
+ /// @cond IGNORE
+