rpms / vxl

Clone
Source Code
GIT

Files

  1.   084215b47968cd357b9750302d4ebed0ca6aa619
  2.   0002-v2.0.2-Use-Fedora-FindEXPAT.patch
Blob Blame History Raw 
From 73535b3c72cf0ca6e1a5c9bef4861cbcbff45183 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 15 Nov 2018 15:20:08 +0000
Subject: [PATCH 2/4] v2.0.2 Use Fedora FindEXPAT

---
 contrib/brl/b3p/expat/CMakeLists.txt              | 2 +-
 contrib/brl/b3p/expatpp/CMakeLists.txt            | 2 +-
 contrib/brl/bbas/bkml/CMakeLists.txt              | 2 +-
 contrib/brl/bbas/bvgl/CMakeLists.txt              | 2 +-
 contrib/brl/bbas/bvgl/tests/CMakeLists.txt        | 2 +-
 contrib/brl/bbas/bwm/CMakeLists.txt               | 2 +-
 contrib/brl/bbas/bwm/io/CMakeLists.txt            | 2 +-
 contrib/brl/bbas/bwm/video/CMakeLists.txt         | 2 +-
 contrib/brl/bbas/bwm/video/exe/CMakeLists.txt     | 2 +-
 contrib/brl/bbas/bxml/CMakeLists.txt              | 2 +-
 contrib/brl/bbas/volm/CMakeLists.txt              | 2 +-
 contrib/brl/bpro/CMakeLists.txt                   | 2 +-
 contrib/brl/bseg/bbgm_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/betr_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/bmdl_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/boxm/CMakeLists.txt              | 2 +-
 contrib/brl/bseg/boxm2/CMakeLists.txt             | 2 +-
 contrib/brl/bseg/boxm2/volm/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/boxm2_batch/CMakeLists.txt       | 2 +-
 contrib/brl/bseg/boxm_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/brec_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/bstm/CMakeLists.txt              | 2 +-
 contrib/brl/bseg/bstm_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/bstm_multi/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  | 2 +-
 contrib/brl/bseg/bvpl/functors/CMakeLists.txt     | 2 +-
 contrib/brl/bseg/bvpl/kernels/CMakeLists.txt      | 2 +-
 contrib/brl/bseg/bvpl_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt | 2 +-
 contrib/brl/bseg/bvxm/CMakeLists.txt              | 2 +-
 contrib/brl/bseg/bvxm_batch/CMakeLists.txt        | 2 +-
 contrib/brl/bseg/bvxm_bridge/CMakeLists.txt       | 2 +-
 contrib/brl/bseg/vcon/CMakeLists.txt              | 2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
index 5b9d660530acd9310dfb554171d70cdc7417028f..de3997078024fe9a3283534cc5b0b9819af6a0a8 100644
--- a/contrib/brl/b3p/expat/CMakeLists.txt
+++ b/contrib/brl/b3p/expat/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(expat C)
 #include_regular_expression("^.*$")
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(NOT VXL_USING_NATIVE_EXPAT)
 
   if(WIN32)
diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
index 4959c123c336ee7935b31dbeffc97f734c07d73a..71ecd0568b7f9e01f9e266af6ca6fe308fbc1484 100644
--- a/contrib/brl/b3p/expatpp/CMakeLists.txt
+++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 #This is brl/b3p/expatpp
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if( EXPAT_FOUND )
 
   if( VXL_USING_NATIVE_EXPAT )
diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d111d4713 100644
--- a/contrib/brl/bbas/bkml/CMakeLists.txt
+++ b/contrib/brl/bbas/bkml/CMakeLists.txt
@@ -5,7 +5,7 @@ set(bkml_sources
   bkml_write.h bkml_write.cxx
 )
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 if(EXPAT_FOUND)
  if(EXPATPP_FOUND)
diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
index c4da5b9d289cdbd64ca12e20a8941856f5d91342..29e4cf838da65cb60f4580f1daee5f3ac3e4e4d2 100644
--- a/contrib/brl/bbas/bvgl/CMakeLists.txt
+++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
@@ -37,7 +37,7 @@ aux_source_directory(Templates bvgl_sources)
 
 
 #find expatpp library for
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
   include_directories( ${EXPAT_INCLUDE_DIR} )
   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
index 76995137ed8d81fb80c10bf6d9f810b9f4003210..88eebcd621c2f5dcc775374c77289a77f5ed7e53 100644
--- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
@@ -16,7 +16,7 @@ set(bvgl_test_sources
 )
 
 #Make sure expat library is found
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 if(EXPAT_FOUND)
   set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
index dace2292e7e09803845f90519be8fcb50fc2131a..78f35ac924ab58e1ec8836220217168ca29572e0 100644
--- a/contrib/brl/bbas/bwm/CMakeLists.txt
+++ b/contrib/brl/bbas/bwm/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 
 include( ${BRL_MODULE_PATH}/FindSHAPELIB.cmake )
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 # Set CMake options for using vgui
 include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
index dc2102047f46fffb68d2f1e92c5718dd656c09a8..9c55cc59ba1dc8c87d6c304f9eef0551f0102e70 100644
--- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
+++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
@@ -7,7 +7,7 @@ set(bwm_io_sources
 )
 aux_source_directory(Templates bwm_io_sources)
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 if(EXPAT_FOUND)
  if(EXPATPP_FOUND)
diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
index 5408fe77a72b842784b3c05aaf30379f08fcddc1..2dd989f27c6b34ea72052eda258caf1c27f4f3f1 100644
--- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
+++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
@@ -11,7 +11,7 @@ set(bwm_video_sources
                                  bwm_video_site_io_defs.h
 )
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 if(EXPAT_FOUND)
  if(EXPATPP_FOUND)
diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
index ca3c490d5e9674c465bd5a57f709882bad9c71ac..baff80256f9f13a71533b51b7e30876199c0c5ac 100644
--- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This is contrib/bwm/exe/CMakeLists.txt
 # World Modeling GUI executables
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
index c027dfaa286137f879e6b70043e0b291663039d4..239f6e528e36121d243d763732287809062f57df 100644
--- a/contrib/brl/bbas/bxml/CMakeLists.txt
+++ b/contrib/brl/bbas/bxml/CMakeLists.txt
@@ -12,7 +12,7 @@ set( bxml_sources
     bxml_find.cxx                bxml_find.h
 )
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 if(EXPAT_FOUND)
  if(EXPATPP_FOUND)
diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
index cf11103557090d878dd388f14f3b90e870695e2e..9047257fc5f78dcce4d52b6c2aa0e76c9b54931c 100644
--- a/contrib/brl/bbas/volm/CMakeLists.txt
+++ b/contrib/brl/bbas/volm/CMakeLists.txt
@@ -6,7 +6,7 @@
 include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
 if(HAS_GEOTIFF)
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
index 637c1ecfa8479088678c34f48ce022c7acd533a2..803917fd2496180d111afeed78a7f15d674ca4cd 100644
--- a/contrib/brl/bpro/CMakeLists.txt
+++ b/contrib/brl/bpro/CMakeLists.txt
@@ -1,7 +1,7 @@
 # brl/bpro/CMakeLists.txt
 # main package for processing operations
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
 
 # Basic process classes
diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..21b1fbec894cb1ae1911b21962d47617a6c96d73 100644
--- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
@@ -1,7 +1,7 @@
 # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     if(EXPATPP_FOUND)
     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
index 3c5d70e0c6569aa51761f99782b51b7920e17681..0069fb9ff38fcd93a2e1db418599920d2c3043bb 100644
--- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
@@ -4,7 +4,7 @@ project( betr_batch )
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
index f341e59f07f614bf38bee3f41305bbbd46f63653..e253c8f5011df5e19b1f2dba88acb26e61c17a39 100644
--- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
@@ -1,7 +1,7 @@
 # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
    if(EXPATPP_FOUND)
     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..0ddd6033d50b38502a7ebbd986b474401a08b8a0 100644
--- a/contrib/brl/bseg/boxm/CMakeLists.txt
+++ b/contrib/brl/bseg/boxm/CMakeLists.txt
@@ -1,5 +1,5 @@
 # contrib/brl/bseg/boxm/CMakeLists.txt
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
 
 include_directories( ${EXPAT_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
index 4475e418be3d2475f24e6df71a18319efb242e38..14acc308ecbbe8c499c16ee60682e599ae49c55e 100644
--- a/contrib/brl/bseg/boxm2/CMakeLists.txt
+++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
@@ -21,7 +21,7 @@ set(boxm2_sources
     boxm2_blocks_vis_graph.h          boxm2_blocks_vis_graph.cxx
    )
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
 
   include_directories( ${EXPAT_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
index 861b960f4d44c92fc900280581cda2b87fce5f0d..c3ae5b39bf376fb5e24c722bde74f0b1ab3420fd 100644
--- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
@@ -1,6 +1,6 @@
 # This is contrib/brl/bseg/boxm2/volm/CMakeLists
 # volm depends on bkml and expat
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
     #depends on OPENCL being found...
diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
index 70e603743b280db75ea9bb006cbf63d867cdd16f..77f8f743f9c990f44b0403340c21777571483dff 100644
--- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
@@ -9,7 +9,7 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
 include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
 
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
index 1d57861444e72e66e3ee04c96e496ee4b89b206f..a6f24b1da9d9ec9702595a9912ec10d2ae03ef9f 100644
--- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
@@ -4,7 +4,7 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
 
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
index b7e3039d7ee534d30de991a7e4aae3f940b7b360..c13969e15d090e63831455cee0ea61d1c5e98557 100644
--- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
@@ -1,7 +1,7 @@
 # contrib/brl/bseg/brec_batch/CMakeLists.txt
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
index 977d68fdab136cf193f7e712e63bbd607113066a..97a895fa28ef6d9e9b11cb45f324d5e0ba39818b 100644
--- a/contrib/brl/bseg/bstm/CMakeLists.txt
+++ b/contrib/brl/bseg/bstm/CMakeLists.txt
@@ -15,7 +15,7 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
                  bstm_time_block.h bstm_time_block.cxx
                  bstm_util.cxx bstm_util.h)
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
   include_directories( ${EXPAT_INCLUDE_DIR} )
   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
index c94ddbcc4c159b771d85bb6a81a0e38d77750023..8b6aa9f1f2ff8b0c8712b0201dc22e140a53afcf 100644
--- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
@@ -12,7 +12,7 @@ if(DIRECTSHOW_FOUND)
 endif()
 
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
index ba8815fe6bef5982f655a3c6f13afefb64743344..6abac60395a72f232cc718059315036a8e1639b7 100644
--- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
@@ -15,7 +15,7 @@ set(bstm_multi_sources
   space_time_scene_parser.h space_time_scene_parser.hxx
   )
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if (EXPAT_FOUND)
   include_directories( ${EXPAT_INCLUDE_DIR} )
   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..cefb928abc92300bdd5f19e4f067664cdf36f701 100644
--- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
 # Brown Voxel Processing library for octrees
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 
 #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
 #mark_as_advanced( VXL_FORCE_V3P_RPLY )
diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
index 25433e56f26dd49fb413480b1aa67a312f9999fb..550528c08c6afd2a08aedc230d8df63f705d41cb 100644
--- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 # The kernel-related files for Brown Voxel Processing Library (BVPL)
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
 
 include_directories( ${EXPAT_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..5b2a2750de2225048bd4ff67fa6d310eeccc9e5c 100644
--- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 # The kernel-related files for Brown Voxel Processing Library (BVPL)
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
 
 include_directories( ${EXPAT_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
index 90102867454d6308ab766a13d101567562920633..abca67a186d7f8305c2f235b35924ecd7eddb8a5 100644
--- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
@@ -1,7 +1,7 @@
 # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..2b7731521f5f19579819ffd17370b474ad7e0a2f 100644
--- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
@@ -1,7 +1,7 @@
 # contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..d6ba4cc128b3005fa169f89512da9abcee1231e0 100644
--- a/contrib/brl/bseg/bvxm/CMakeLists.txt
+++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
@@ -38,7 +38,7 @@ set(bvxm_sources
 aux_source_directory(Templates bvxm_sources)
 
 #find expatpp library for bvxm_world_params parser
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
   include_directories( ${EXPAT_INCLUDE_DIR} )
   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
index 58ece0b8d3852237d36db89e868463369dc4502c..779c056a765516fa4934ca9de313366ec4b7adb5 100644
--- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
@@ -2,7 +2,7 @@
 if(HAS_GEOTIFF)
 include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
 if( PYTHON_FOUND )
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if( EXPAT_FOUND )
     include_directories( ${PYTHON_INCLUDE_DIRS} )
     include_directories( ${BRL_INCLUDE_DIR} )
diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
index b7b0636f29e443a9e02a6354faf204f01c2617e9..0fc2e895f7a686f8009e30148f56a134fafe314d 100644
--- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
@@ -8,7 +8,7 @@ if(OPENCL_FOUND)
   include_directories( ${MUL_INCLUDE_DIR} )
 
   #find expatpp library
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+  FIND_PACKAGE(EXPAT REQUIRED)
   if(EXPAT_FOUND)
     include_directories( ${EXPAT_INCLUDE_DIR} )
     include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
index 26504576be394f4351e7ef1521ab3fff38616003..1fc507d257953975931e8cab9a86b97e4680e461 100644
--- a/contrib/brl/bseg/vcon/CMakeLists.txt
+++ b/contrib/brl/bseg/vcon/CMakeLists.txt
@@ -4,7 +4,7 @@
 include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
 if(HAS_GEOTIFF)
 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+FIND_PACKAGE(EXPAT REQUIRED)
 if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
     include_directories( ${BRL_INCLUDE_DIR} )
-- 
2.21.0
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.