diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pcl-1-disable-sse-check.patch | 17 | ||||
| -rw-r--r-- | src/pcl-2-disable-executables.patch | 30 | ||||
| -rw-r--r-- | src/pcl-3-fix-hashmap.patch | 14 | ||||
| -rw-r--r-- | src/pcl.mk | 37 |
4 files changed, 98 insertions, 0 deletions
diff --git a/src/pcl-1-disable-sse-check.patch b/src/pcl-1-disable-sse-check.patch new file mode 100644 index 0000000..b9f8707 --- /dev/null +++ b/src/pcl-1-disable-sse-check.patch @@ -0,0 +1,17 @@ +This file is part of MXE. +See index.html for further information. + +--- a/CMakeLists.txt 2012-12-06 14:21:15.914117050 +0100 ++++ b/CMakeLists.txt 2012-12-06 14:20:53.342117928 +0100 +@@ -86,8 +86,9 @@ + endif() + + # check for SSE flags +-include(${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake) +-PCL_CHECK_FOR_SSE() ++#include(${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake) ++#PCL_CHECK_FOR_SSE() ++set(SSE_FLAGS) + + if (__COMPILER_PATHSCALE) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized -zerouv -pthread -mp") diff --git a/src/pcl-2-disable-executables.patch b/src/pcl-2-disable-executables.patch new file mode 100644 index 0000000..c290718 --- /dev/null +++ b/src/pcl-2-disable-executables.patch @@ -0,0 +1,30 @@ +This file is part of MXE. +See index.html for further information. + +--- a/visualization/tools/CMakeLists.txt 2012-12-06 09:40:39.354741544 +0100 ++++ b/visualization/tools/CMakeLists.txt 2012-12-06 09:40:46.562742448 +0100 +@@ -1,24 +0,0 @@ +-PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcd_viewer ${SUBSYS_NAME} pcd_viewer.cpp) +-target_link_libraries(pcd_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) +- +-PCL_ADD_EXECUTABLE_OPT_BUNDLE(timed_trigger_test ${SUBSYS_NAME} timed_trigger_test.cpp) +-target_link_libraries(timed_trigger_test pcl_io pcl_common pcl_kdtree pcl_visualization) +- +-if(OPENNI_FOUND AND BUILD_OPENNI) +- +- PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcd_grabber_viewer ${SUBSYS_NAME} pcd_grabber_viewer.cpp) +- target_link_libraries(pcd_grabber_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) +- +- #PCL_ADD_EXECUTABLE(openni_viewer_simple ${SUBSYS_NAME} openni_viewer_simple.cpp) +- #target_link_libraries(openni_viewer_simple pcl_common pcl_io pcl_kdtree pcl_visualization) +- +- PCL_ADD_EXECUTABLE_OPT_BUNDLE(oni_viewer ${SUBSYS_NAME} oni_viewer_simple.cpp) +- target_link_libraries(oni_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) +- +- PCL_ADD_EXECUTABLE_OPT_BUNDLE(openni_viewer ${SUBSYS_NAME} openni_viewer.cpp) +- target_link_libraries(openni_viewer pcl_common pcl_io pcl_kdtree pcl_visualization) +- +- PCL_ADD_EXECUTABLE_OPT_BUNDLE(openni_image ${SUBSYS_NAME} openni_image.cpp) +- target_link_libraries(openni_image pcl_common pcl_io pcl_kdtree pcl_visualization) +-endif() +- diff --git a/src/pcl-3-fix-hashmap.patch b/src/pcl-3-fix-hashmap.patch new file mode 100644 index 0000000..245b944 --- /dev/null +++ b/src/pcl-3-fix-hashmap.patch @@ -0,0 +1,14 @@ +This file is part of MXE. +See index.html for further information. + +--- a/surface/include/pcl/surface/poisson/hash.h 2012-12-06 09:09:17.962812894 +0100 ++++ b/surface/include/pcl/surface/poisson/hash.h 2012-12-06 09:09:29.630812193 +0100 +@@ -43,7 +43,7 @@ + #define PCL_POISSON_HASH_H_ + + +-#ifdef WIN32 ++#ifdef _MSC_VER + #include <hash_map> + using namespace stdext; + #else // !WIN32 diff --git a/src/pcl.mk b/src/pcl.mk new file mode 100644 index 0000000..0793202 --- /dev/null +++ b/src/pcl.mk @@ -0,0 +1,37 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := pcl +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 45a2e155d7faf5901abe609fd40d5f1659015e9e +$(PKG)_SUBDIR := PCL-$($(PKG)_VERSION)-Source +$(PKG)_FILE := PCL-$($(PKG)_VERSION)-Source.tar.bz2 +$(PKG)_URL := http://www.pointclouds.org/assets/files/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libgomp boost eigen flann vtk + +define $(PKG)_UPDATE + /bin/false +endef + +# There is a strange problem where including <cfloat> leads to an error +# in some of the #include_next magic with float.h. +# We work around this by avoiding an #include_next in MinGW's float.h +# (by defining __FLOAT_H) and then manually defining the MIN/MAX macros +# that PCL wants to use. + +define $(PKG)_BUILD + cd '$(1)' && \ + CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__" \ + cmake . \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_RELEASE_POSTFIX='' \ + -DBoost_THREADAPI=win32 \ + -DPCL_SHARED_LIBS=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_apps=OFF \ + -DBUILD_examples=OFF \ + -DBUILD_global_tests=OFF \ + -DBUILD_tools=OFF + $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 +endef |