diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-05 22:13:35 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-10-06 07:21:19 (GMT) |
| commit | 73f7210325c23206d115e873a0b6a6a9f87d4537 (patch) | |
| tree | 6dcb57befd3f96f168e4a98560103102891c7693 | |
| parent | a528dc936ccc9b881bbe05106dad131b51e53aa2 (diff) | |
| download | mxe-73f7210325c23206d115e873a0b6a6a9f87d4537.zip mxe-73f7210325c23206d115e873a0b6a6a9f87d4537.tar.gz mxe-73f7210325c23206d115e873a0b6a6a9f87d4537.tar.bz2 | |
pcl: update from 1.7.2 to 1.8.0
Patch pcl-1-cmake-policy-cmp0017.patch is not needed.
See https://github.com/PointCloudLibrary/pcl/commit/51a230f07eb9738ed
New option -DHAVE_SSSE3_EXTENSIONS_EXITCODE=0 is needed to fix this:
CMake Error: TRY_RUN() invoked in cross-compiling mode,
please set the following cache variables appropriately:
HAVE_SSSE3_EXTENSIONS_EXITCODE (advanced)
Update of vtk to 7 depends on updating pcl to 1.8.0,
because pcl 1.7.2 fails with vtk 7.
See https://github.com/mxe/mxe/pull/1527#issuecomment-251645448
| -rw-r--r-- | src/pcl-1-cmake-policy-cmp0017.patch | 27 | ||||
| -rw-r--r-- | src/pcl.mk | 5 |
2 files changed, 3 insertions, 29 deletions
diff --git a/src/pcl-1-cmake-policy-cmp0017.patch b/src/pcl-1-cmake-policy-cmp0017.patch deleted file mode 100644 index fd9e82a..0000000 --- a/src/pcl-1-cmake-policy-cmp0017.patch +++ /dev/null @@ -1,27 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 0a5d7e96ad3d5ce39284968258fe78f39fe5f4ca Mon Sep 17 00:00:00 2001 -From: Boris Nagaev <bnagaev@gmail.com> -Date: Thu, 27 Aug 2015 08:16:41 +0200 -Subject: [PATCH] cmake_policy CMP0017 - ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f0a5600..ea9ebcf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ if(POLICY CMP0048) - cmake_policy(SET CMP0048 OLD) # do not use VERSION option in project() command - endif() - -+cmake_policy(SET CMP0017 NEW) -+ - set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "possible configurations" FORCE) - - # In case the user does not setup CMAKE_BUILD_TYPE, assume it's RelWithDebInfo --- -1.7.10.4 - @@ -2,8 +2,8 @@ PKG := pcl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.2 -$(PKG)_CHECKSUM := 479f84f2c658a6319b78271111251b4c2d6cf07643421b66bbc351d9bed0ae93 +$(PKG)_VERSION := 1.8.0 +$(PKG)_CHECKSUM := 9e54b0c1b59a67a386b9b0f4acb2d764272ff9a0377b825c4ed5eedf46ebfcf4 $(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/PointCloudLibrary/pcl/archive/$($(PKG)_FILE) @@ -42,6 +42,7 @@ define $(PKG)_BUILD -DHAVE_MM_MALLOC_EXITCODE=0 \ -DHAVE_SSE4_2_EXTENSIONS_EXITCODE=0 \ -DHAVE_SSE4_1_EXTENSIONS_EXITCODE=0 \ + -DHAVE_SSSE3_EXTENSIONS_EXITCODE=0 \ -DHAVE_SSE3_EXTENSIONS_EXITCODE=0 \ -DHAVE_SSE2_EXTENSIONS_EXITCODE=0 \ -DHAVE_SSE_EXTENSIONS_EXITCODE=0 |