diff options
| author | Claudio Fantacci <claudiofantacci@users.noreply.github.com> | 2018-04-24 20:09:12 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-04-24 11:09:12 -0700 |
| commit | f0767d3bd996553636a5cdc6bd2cad8f9aa903b5 (patch) | |
| tree | 7efcb87e620e795b745f78255504e30f66a8218f | |
| parent | de4edd0e8c8487158aedbf4d9cd4cd78554127c6 (diff) | |
| download | vcpkg-f0767d3bd996553636a5cdc6bd2cad8f9aa903b5.tar.gz vcpkg-f0767d3bd996553636a5cdc6bd2cad8f9aa903b5.zip | |
Fix PCL compile tools (#3301)
Add missing boost definition using a patch.
Better compile from HEAD.
| -rw-r--r-- | ports/pcl/boost_uuid_random_generator_compat.patch | 13 | ||||
| -rw-r--r-- | ports/pcl/portfile.cmake | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ports/pcl/boost_uuid_random_generator_compat.patch b/ports/pcl/boost_uuid_random_generator_compat.patch new file mode 100644 index 000000000..891890b46 --- /dev/null +++ b/ports/pcl/boost_uuid_random_generator_compat.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0405dca2..00e5238e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -168,6 +168,8 @@ if(CMAKE_COMPILER_IS_MSVC) + endif() + endif() + ++add_definitions(-DBOOST_UUID_RANDOM_GENERATOR_COMPAT) ++ + if(CMAKE_COMPILER_IS_PATHSCALE) + if("${CMAKE_CXX_FLAGS}" STREQUAL "") + SET(CMAKE_CXX_FLAGS "-Wno-uninitialized -zerouv -pthread -mp") diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 812e05674..12c9ec398 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/find_openni2.patch" "${CMAKE_CURRENT_LIST_DIR}/find_cuda.patch" "${CMAKE_CURRENT_LIST_DIR}/vs2017-15.4-workaround.patch" + "${CMAKE_CURRENT_LIST_DIR}/boost_uuid_random_generator_compat.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) |