Attachment 1452762 Details for Bug 1592564 – Updated patch 0003 Use system rply

[patch] Updated patch 0003 Use system rply

0003-Use-system-rply.patch (text/plain), 1.22 KB, created by Mark Harfouche on 2018-06-18 23:47:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Harfouche

Created: 2018-06-18 23:47:41 UTC

Size: 1.22 KB

patch

obsolete

>diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
>index 5cf355e3fe..250ec1e4c4 100644
>--- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
>+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
>@@ -1,8 +1,10 @@
> # This is bbas/bmsh3d/algo/CMakeLists.txt
> # Brown 3D Mesh Algorithm Library
> 
>+FIND_PACKAGE(rply REQUIRED)
>+
> include_directories( ${BRL_INCLUDE_DIR} )
>-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
>+INCLUDE_DIRECTORIES( ${RPLY_INCLUDE_DIR} )
> 
> set( bmsh3d_algo_sources
>   bmsh3d_fileio.cxx           bmsh3d_fileio.h
>diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
>index 0a25e9f428..6bafd336ce 100644
>--- a/v3p/CMakeLists.txt
>+++ b/v3p/CMakeLists.txt
>@@ -58,6 +58,4 @@ if(BUILD_CORE_IMAGING)
>   mark_as_advanced( VXL_FORCE_V3P_OPENJPEG2 )
>   add_subdirectory(openjpeg2)
> 
>-  add_subdirectory(rply)
>-
> endif()
>diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
>index 9085a628a1..e69de29bb2 100644
>--- a/v3p/rply/CMakeLists.txt
>+++ b/v3p/rply/CMakeLists.txt
>@@ -1,9 +0,0 @@
>-# This is /v3p/rply/CMakeLists.txt
>-# library for reading and writing .PLY file
>-
>-set(rply_sources
>-  rply.h
>-  rply.c
>-  )
>-
>-vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources})

Actions: View | Diff

Attachments on bug 1592564: 1452741 | 1452742 | 1452761 | 1452762