From fd9b23072f2576df93e54d0feba6f0a569321341 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Wed, 30 Jan 2019 16:41:04 +0100
Subject: [PATCH] Add build and testing to CI
---
CI/configure_option.cmake | 1 -
CI/main_ci.cmake | 25 ++++++++++++++++++-------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake
index 4e192391ca..dd457e443f 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 29de8f95de..d3bc7cbfc5 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
--
GitLab