Commit 67b12c02 authored by Stephane ALBERT's avatar Stephane ALBERT
Browse files

ENH: Added test pass in CI/super_build.cmake.

No related merge requests found
Showing with 10 additions and 5 deletions
+10 -5
...@@ -69,7 +69,7 @@ endif() ...@@ -69,7 +69,7 @@ endif()
set (CMAKE_COMMAND "cmake") set (CMAKE_COMMAND "cmake")
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} "-E" "tar" "xf" COMMAND ${CMAKE_COMMAND} "-E" "tar" "xf"
"${CI_PROJ_DIR}/superbuild-artifact/SuperBuild_Install.tar" "${CI_PROJ_DIR}/superbuild-artifact/SuperBuild_Install.tar"
WORKING_DIRECTORY ${CI_ROOT_DIR} WORKING_DIRECTORY ${CI_ROOT_DIR}
) )
...@@ -92,7 +92,7 @@ endif() ...@@ -92,7 +92,7 @@ endif()
set ( CTEST_BUILD_CONFIGURATION "Release" ) set ( CTEST_BUILD_CONFIGURATION "Release" )
set ( CTEST_CMAKE_GENERATOR "Unix Makefiles" ) set ( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
set ( CTEST_BUILD_FLAGS "-j16" ) set ( CTEST_BUILD_FLAGS "-j8" )
set ( CTEST_BUILD_NAME "Superbuild_Build_Otb" ) set ( CTEST_BUILD_NAME "Superbuild_Build_Otb" )
set ( CTEST_SITE "${IMAGE_NAME}" ) set ( CTEST_SITE "${IMAGE_NAME}" )
...@@ -105,18 +105,18 @@ set ( PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}" ) ...@@ -105,18 +105,18 @@ set ( PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}" )
set (CONFIGURE_OPTIONS "") set (CONFIGURE_OPTIONS "")
include ( "${CMAKE_CURRENT_LIST_DIR}/configure_option.cmake" ) include ( "${CMAKE_CURRENT_LIST_DIR}/configure_option.cmake" )
# SuperBuild case : one more configure option # SuperBuild case : one more configure option
set ( CONFIGURE_OPTIONS set ( CONFIGURE_OPTIONS
"${CONFIGURE_OPTIONS}-DCMAKE_PREFIX_PATH=${XDK_PATH};") "${CONFIGURE_OPTIONS}-DCMAKE_PREFIX_PATH=${XDK_PATH};")
# Hack because there is no more superbuild available (LIBKML) # Hack because there is no more superbuild available (LIBKML)
set ( CONFIGURE_OPTIONS set ( CONFIGURE_OPTIONS
"${CONFIGURE_OPTIONS}-DOTB_USE_LIBKML:BOOL=OFF;" ) "${CONFIGURE_OPTIONS}-DOTB_USE_LIBKML:BOOL=OFF;" )
# FIX ME this part might platform dependent # FIX ME this part might platform dependent
set( GDAL_DATA "${XDK_PATH}/share/gdal" ) set( GDAL_DATA "${XDK_PATH}/share/gdal" )
set( GEOTIFF_CSV "${XDK_PATH}/share/epsg_csv" ) set( GEOTIFF_CSV "${XDK_PATH}/share/epsg_csv" )
set( PROJ_LIB "${XDK_PATH}/share" ) set( PROJ_LIB "${XDK_PATH}/share" )
set( CTEST_ENVIRONMENT set( CTEST_ENVIRONMENT
"PATH=${XDK_PATH}/lib:${XDK_PATH}/bin:$ENV{PATH} "PATH=${XDK_PATH}/lib:${XDK_PATH}/bin:$ENV{PATH}
GDAL_DATA= GDAL_DATA GDAL_DATA= GDAL_DATA
GEOTIFF_CSV= GEOTIFF_CSV GEOTIFF_CSV= GEOTIFF_CSV
...@@ -158,4 +158,9 @@ endif() ...@@ -158,4 +158,9 @@ endif()
# message( SEND_ERROR "An error occurs during ctest_test.") # message( SEND_ERROR "An error occurs during ctest_test.")
# endif() # endif()
ctest_test(
BUILD "${CTEST_BINARY_DIRECTORY}"
PARALLEL_LEVEL 4
)
ctest_submit() ctest_submit()
Supports Markdown
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