Skip to content
Snippets Groups Projects
Commit e6d000d7 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

CI: simplify install step

parent 4f527451
No related branches found
No related tags found
No related merge requests found
......@@ -51,8 +51,9 @@ OTB_USE_QWT:BOOL=ON
OTB_USE_SHARK:BOOL=ON
OTB_USE_SIFTFAST:BOOL=ON
OTB_USE_SPTW:BOOL=ON
OTB_USE_SSE_FLAGS:BOOL=ON
OTB_MPIEXEC_OPT:STRING=--allow-run-as-root")
OTB_USE_SSE_FLAGS:BOOL=ON")
# Usefull if MPI is ON : OTB_MPIEXEC_OPT:STRING=--allow-run-as-root
set (otb_wrap_option
"OTB_WRAP_PYTHON:BOOL=ON")
......
......@@ -119,6 +119,13 @@ if ( NOT _configure_rv EQUAL 0 )
endif()
# ------------------------------ Build -----------------------------------------
if(ci_skip_install)
message(STATUS "Skip install")
set(CTEST_BUILD_TARGET)
else()
set(CTEST_BUILD_TARGET install)
endif()
ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
RETURN_VALUE _build_rv
CAPTURE_CMAKE_ERROR _build_error
......@@ -157,33 +164,6 @@ endif()
# ----------------------------- Submit -----------------------------------------
ctest_submit()
# --------------------------- Install ----------------------------------------
if(ci_skip_install)
message(STATUS "Skip install")
set(_install_rv 0)
else()
ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
TARGET install
RETURN_VALUE _install_rv
CAPTURE_CMAKE_ERROR _install_error
)
if ( DEBUG )
message( "Install output")
message( "install_return_value = ${_install_rv}" )
message( "install_error = ${_install_error}" )
endif()
# Install log
file ( WRITE
"${OTB_SOURCE_DIR}/log/install_return_value_log.txt" "${_install_rv}")
file ( WRITE
"${OTB_SOURCE_DIR}/log/install_error_log.txt" "${_install_error}")
endif()
if ( NOT _install_rv EQUAL 0 )
message( SEND_ERROR "Install has failed.")
endif()
# ---------------------------- Doxygen -----------------------------------------
if(ENABLE_DOXYGEN)
ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment