Commit 63f12e44 authored by Julien Michel's avatar Julien Michel
Browse files

Merge branch 'release-5.6' of https://git.orfeo-toolbox.org/git/otb into release-5.6

parents 7af4d202 f7f9631a
...@@ -57,18 +57,27 @@ macro(macro_create_targets_for_package pkg) ...@@ -57,18 +57,27 @@ macro(macro_create_targets_for_package pkg)
COMMAND ${CMAKE_COMMAND} --build "." --target install COMMAND ${CMAKE_COMMAND} --build "." --target install
WORKING_DIRECTORY "${Monteverdi_BINARY_DIR}" WORKING_DIRECTORY "${Monteverdi_BINARY_DIR}"
) )
else() #Unxies Using SuperBuild else() #Using SuperBuild
if(ENABLE_MONTEVERDI) #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 add_custom_target(PACKAGE-${pkg}-check
COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check" COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check")
DEPENDS MVD 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) else(ENABLE_MONTEVERDI)
add_custom_target(PACKAGE-${pkg}-check add_custom_target(PACKAGE-${pkg}-check
COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check" COMMAND ${CMAKE_COMMAND} -E echo "Building PACKAGE-${pkg}-check"
DEPENDS OTB DEPENDS OTB
) WORKING_DIRECTORY ${SUPERBUILD_BINARY_DIR}
endif(ENABLE_MONTEVERDI) )
endif(ENABLE_MONTEVERDI)
endif(OUT_OF_SOURCE_BUILD)
endif() endif()
add_dependencies(PACKAGE-${pkg}-check PACKAGE-TOOLS) add_dependencies(PACKAGE-${pkg}-check PACKAGE-TOOLS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment