diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake index b8ddf48bd4469bc6b75e7b010e2f6325bd0afdf7..01ae0021f20e9ce38e3290dded46dde7bf2d0bac 100644 --- a/CI/configure_option.cmake +++ b/CI/configure_option.cmake @@ -7,9 +7,8 @@ set (otb_build_project_option "BUILD_COOKBOOK:BOOL=OFF BUILD_EXAMPLES:BOOL=OFF -BUILD_SHARED_LIBS:BOOL=OFF -BUILD_TESTING:BOOL=OFF") - +BUILD_SHARED_LIBS:BOOL=ON +BUILD_TESTING:BOOL=ON") set (otb_use_option "OTB_USE_6S:BOOL=OFF @@ -43,6 +42,12 @@ set (otb_data_option OTB_DATA_USE_LARGEINPUT:BOOL=OFF OTB_DATA_LARGEINPUT_ROOT:PATH=${OTB_LARGEINPUT_ROOT}") +set (cmake_configure_option +"CMAKE_BUILD_TYPE=${CTEST_BUILD_CONFIGURATION} +CMAKE_INSTALL_PREFIX:PATH=${CTEST_INSTALL_DIRECTORY} +CMAKE_C_FLAGS:STRING=-fPIC -Wall -Wextra +CMAKE_CXX_FLAGS:STRING=-fPIC -Wall -Wextra -Wno-cpp") + #Transform the previous string in list string (REPLACE "\n" ";" otb_build_project_option ${otb_build_project_option}) string (REPLACE "\n" ";" otb_use_option ${otb_use_option}) diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake index dae65e947366b8109ddec0358bcf49802c00c2d5..4135bef2af5de76de35e2861a359aaf0466bdb8f 100644 --- a/CI/main_ci.cmake +++ b/CI/main_ci.cmake @@ -3,31 +3,37 @@ set (ENV{LANG} "C") # Only ascii output # Create build directory get_filename_component(OTB_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY) -#Ctest setting +# Build Configuration : Release, Debug.. set (CTEST_BUILD_CONFIGURATION "Release") + +# Directory variable set (CTEST_SOURCE_DIRECTORY "${OTB_SOURCE_DIR}") set (CTEST_BINARY_DIRECTORY "${OTB_SOURCE_DIR}/build/") -set (CMAKE_COMMAND "cmake") +set (CTEST_INSTALL_DIRECTORY "${OTB_SOURCE_DIR}/install/") set (PROJECT_SOURCE_DIR "${OTB_SOURCE_DIR}") -# number of thread used for compilation -set (CTEST_BUILD_FLAGS "-j8") + +# Ctest command value +set (CMAKE_COMMAND "cmake") +set (CTEST_BUILD_FLAGS "-j8") # number of thread used for compilation set (CTEST_BUILD_COMMAND "make ${CTEST_BUILD_FLAGS}") set (CTEST_CMAKE_GENERATOR "Unix Makefiles") set (CTEST_BUILD_NAME "CI_TEST") -ctest_start ("Nightly") - -# ctest_update() no need to update it is done by Gitlab-CI - +# Data directory setting set (OTB_DATA_ROOT "${OTB_SOURCE_DIR}/otb-data/") # todo set (OTB_LARGEINPUT_ROOT "") # todo -set (CONFIGURE_OPTIONS "") + #The following file set the CONFIGURE_OPTIONS variable +set (CONFIGURE_OPTIONS "") include ( "${CMAKE_CURRENT_LIST_DIR}/configure_option.cmake" ) +# End of configuration + + +ctest_start ("Nightly") ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" SOURCE "${OTB_SOURCE_DIR}"