From f7f9631a69b50164d93ec42bb78d163b0998eaae Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 12 Jul 2016 09:26:22 +0200
Subject: [PATCH] PKG: check MVD and OTB dependencies only if
OTB_OF_SOURCE_BUILD is false
---
SuperBuild/Packaging/PMacros.cmake | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/SuperBuild/Packaging/PMacros.cmake b/SuperBuild/Packaging/PMacros.cmake
index 783cd8dfae..b791177188 100644
--- a/SuperBuild/Packaging/PMacros.cmake
+++ b/SuperBuild/Packaging/PMacros.cmake
@@ -57,18 +57,27 @@ macro(macro_create_targets_for_package pkg)
COMMAND ${CMAKE_COMMAND} --build "." --target install
WORKING_DIRECTORY "${Monteverdi_BINARY_DIR}"
)
- else() #Unxies Using SuperBuild
- if(ENABLE_MONTEVERDI)
+ else() #Using SuperBuild
+ #For out of source build,
+ #we assume the otb is built correctly with superbuild
+ if(OUT_OF_SOURCE_BUILD)
add_custom_target(PACKAGE-${pkg}-check
- COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
- DEPENDS MVD
- )
+ COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check")
+ else(OUT_OF_SOURCE_BUILD)
+ if(ENABLE_MONTEVERDI)
+ add_custom_target(PACKAGE-${pkg}-check
+ COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
+ DEPENDS MVD
+ WORKING_DIRECTORY ${SUPERBUILD_BINARY_DIR}
+ )
else(ENABLE_MONTEVERDI)
- add_custom_target(PACKAGE-${pkg}-check
- COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
- DEPENDS OTB
- )
- endif(ENABLE_MONTEVERDI)
+ add_custom_target(PACKAGE-${pkg}-check
+ COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
+ DEPENDS OTB
+ WORKING_DIRECTORY ${SUPERBUILD_BINARY_DIR}
+ )
+ endif(ENABLE_MONTEVERDI)
+ endif(OUT_OF_SOURCE_BUILD)
endif()
add_dependencies(PACKAGE-${pkg}-check PACKAGE-TOOLS)
--
GitLab