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