diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake index 4e192391caa176af20979aceb49eb6cb0b556744..dd457e443f3390fdebd4c868acac8bbc1e02f2c8 100644 --- a/CI/configure_option.cmake +++ b/CI/configure_option.cmake @@ -20,7 +20,6 @@ OTB_USE_GLUT:BOOL=OFF OTB_USE_GSL:BOOL=OFF OTB_USE_LIBKML:BOOL=OFF OTB_USE_LIBSVM:BOOL=OFF -OTB_USE_MAPNIK:BOOL=OFF OTB_USE_MPI:BOOL=OFF OTB_USE_MUPARSER:BOOL=OFF OTB_USE_MUPARSERX:BOOL=OFF diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake index 29de8f95decad17eaa77a4bbc4852784585f8f77..d3bc7cbfc5aea0d6a005276e02f6565183b28d92 100644 --- a/CI/main_ci.cmake +++ b/CI/main_ci.cmake @@ -9,8 +9,9 @@ set (CTEST_SOURCE_DIRECTORY "${OTB_SOURCE_DIR}") set (CTEST_BINARY_DIRECTORY "${OTB_SOURCE_DIR}/build/") set (CMAKE_COMMAND "cmake") set (PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}") - -# set (CTEST_BUILD_COMMAND "make") +# number of thread used for compilation +set (CTEST_BUILD_FLAGS "-j8") +set (CTEST_BUILD_COMMAND "make") set (CTEST_CMAKE_GENERATOR "Unix Makefiles") set (CTEST_BUILD_NAME "CI_TEST") @@ -31,12 +32,22 @@ include ( "${CMAKE_CURRENT_LIST_DIR}/configure_option.cmake" ) ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" SOURCE "${OTB_SOURCE_DIR}" OPTIONS "${CONFIGURE_OPTIONS}" - RETURN_VALUE _configure_rv) + RETURN_VALUE _configure_rv + CAPTURE_CMAKE_ERROR _configure_error) + +if ( _configure_rv EQUAL -1 ) + message("An error occurs during ctest_configure: + ${_configure_error}") +endif() + +ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" + RETURN_VALUE _build_rv] + CAPTURE_CMAKE_ERROR _build_error] + ) if ( _configure_rv EQUAL -1 ) - message("An error occurs during ctest_configure ${_configure_rv}") + message("An error occurs during ctest_build: + ${_build_error}") endif() -message("${_configure_rv}") -# ctest_build() -# ctest_test() \ No newline at end of file +ctest_test() \ No newline at end of file