|
 |
d8d9cbd |
From 220d1ca54a2cc737d921472c4fe554e0fd52e770 Mon Sep 17 00:00:00 2001
|
|
|
9363723 |
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
|
|
|
9363723 |
Date: Thu, 25 Apr 2019 17:05:39 +0100
|
|
|
d8d9cbd |
Subject: [PATCH 7/9] v2.0.2 fix bkml test
|
|
|
9363723 |
|
|
|
9363723 |
---
|
|
|
9363723 |
contrib/brl/bbas/bkml/CMakeLists.txt | 1 +
|
|
|
9363723 |
contrib/brl/bbas/bkml/tests/CMakeLists.txt | 20 ++++++++++++++++----
|
|
|
9363723 |
2 files changed, 17 insertions(+), 4 deletions(-)
|
|
|
9363723 |
|
|
|
9363723 |
diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
|
|
|
d8d9cbd |
index bb6a65f96d..e34211b0f6 100644
|
|
|
9363723 |
--- a/contrib/brl/bbas/bkml/CMakeLists.txt
|
|
|
9363723 |
+++ b/contrib/brl/bbas/bkml/CMakeLists.txt
|
|
|
9363723 |
@@ -6,6 +6,7 @@ set(bkml_sources
|
|
|
9363723 |
)
|
|
|
9363723 |
|
|
|
9363723 |
FIND_PACKAGE(EXPAT REQUIRED)
|
|
|
9363723 |
+FIND_PACKAGE(EXPATPP REQUIRED)
|
|
|
9363723 |
|
|
|
9363723 |
if(EXPAT_FOUND)
|
|
|
9363723 |
if(EXPATPP_FOUND)
|
|
|
9363723 |
diff --git a/contrib/brl/bbas/bkml/tests/CMakeLists.txt b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
|
|
|
d8d9cbd |
index 84c36469a4..9eddec1f66 100644
|
|
|
9363723 |
--- a/contrib/brl/bbas/bkml/tests/CMakeLists.txt
|
|
|
9363723 |
+++ b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
|
|
|
9363723 |
@@ -1,12 +1,24 @@
|
|
|
9363723 |
# This is contrib/brl/bbas/bkml/tests/CMakeLists.txt
|
|
|
9363723 |
+FIND_PACKAGE(EXPAT REQUIRED)
|
|
|
9363723 |
+FIND_PACKAGE(EXPATPP REQUIRED)
|
|
|
9363723 |
|
|
|
9363723 |
add_executable(bkml_test_all
|
|
|
9363723 |
test_driver.cxx
|
|
|
9363723 |
test_bkml.cxx
|
|
|
9363723 |
)
|
|
|
9363723 |
|
|
|
9363723 |
-target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
|
|
|
9363723 |
-add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
|
|
|
9363723 |
+if(EXPAT_FOUND)
|
|
|
9363723 |
+ if(EXPATPP_FOUND)
|
|
|
9363723 |
+ target_link_libraries(bkml_test_all bkml expatpp expat ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
|
|
|
9363723 |
+ add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
|
|
|
9363723 |
|
|
|
9363723 |
-add_executable(bkml_test_include test_include.cxx )
|
|
|
9363723 |
-target_link_libraries( bkml_test_include bkml )
|
|
|
9363723 |
+ add_executable(bkml_test_include test_include.cxx )
|
|
|
9363723 |
+ target_link_libraries( bkml_test_include bkml expatpp expat)
|
|
|
9363723 |
+ endif()
|
|
|
9363723 |
+else()
|
|
|
9363723 |
+ target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
|
|
|
9363723 |
+ add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
|
|
|
9363723 |
+
|
|
|
9363723 |
+ add_executable(bkml_test_include test_include.cxx )
|
|
|
9363723 |
+ target_link_libraries( bkml_test_include bkml )
|
|
|
9363723 |
+endif()
|
|
|
9363723 |
--
|
|
|
9363723 |
2.21.0
|
|
|
9363723 |
|