diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f59baac2626b15469be898b1003c153933de6885..76ca6e10df03c4d24fda0e13f62d40289e46e53e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,6 +57,7 @@ fast-build: extends: .general only: [merge_requests] stage: build + dependencies: [] debian-build: extends: .common-build diff --git a/CI/ubuntu-18.04-llvm-nodoc.cmake b/CI/ubuntu-18.04-llvm-nodoc.cmake new file mode 100644 index 0000000000000000000000000000000000000000..27ab15d0cd7e0e9c9a7802f2831baf5ef5e5f180 --- /dev/null +++ b/CI/ubuntu-18.04-llvm-nodoc.cmake @@ -0,0 +1,32 @@ +# +# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES) +# +# This file is part of Orfeo Toolbox +# +# https://www.orfeo-toolbox.org/ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Configuration options for ubuntu-18.04-llvm-nodoc + +set(site_option +"opencv_INCLUDE_DIR:PATH=/usr/include +CMAKE_C_COMPILER:STRING=clang +CMAKE_CXX_COMPILER:STRING=clang++ +CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld +CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld +CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld +CMAKE_C_COMPILER_LAUNCHER:STRING=ccache +CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache +OTB_USE_SHARK:BOOL=OFF") diff --git a/CI/ubuntu-18.04-llvm.cmake b/CI/ubuntu-18.04-llvm.cmake index 6480ab2f31b9ddb22b56a15d61ac305a85e85423..9b838da433a06cff9f26281578ad56c0b20c52ec 100644 --- a/CI/ubuntu-18.04-llvm.cmake +++ b/CI/ubuntu-18.04-llvm.cmake @@ -49,6 +49,7 @@ OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\" # See otb-devutils/Scripts/tagfile_fix.py message(STATUS "Get resources for Doxygen build ...") execute_process(COMMAND wget https://www.orfeo-toolbox.org/packages/archives/Doxygen/InsightDoxygenDocTag-4.13.0.gz - COMMAND gzip -d InsightDoxygenDocTag-4.13.0.gz + WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}) + execute_process(COMMAND gzip -d InsightDoxygenDocTag-4.13.0.gz WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}) endif()