From e69f836be0b92f1497bf4987e547c1f7edc0e9df Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Fri, 26 Apr 2019 17:29:18 +0200
Subject: [PATCH] Change where options are
---
CI/main_superbuild.cmake | 2 +-
CI/prepare_superbuild.cmake | 2 +-
.../CI/configure_options.cmake => CI/sb_configure_options.cmake | 0
SuperBuild/CMakeLists.txt | 2 --
4 files changed, 2 insertions(+), 4 deletions(-)
rename SuperBuild/CI/configure_options.cmake => CI/sb_configure_options.cmake (100%)
diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake
index 92646a44ef..246b9f780f 100644
--- a/CI/main_superbuild.cmake
+++ b/CI/main_superbuild.cmake
@@ -17,10 +17,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# This script is a prototype for the future CI, it may evolve rapidly in a near future
include( "${CMAKE_CURRENT_LIST_DIR}/macros.cmake" )
-# This script is a prototype for the future CI, it may evolve rapidly in a near future
set (ENV{LANG} "C") # Only ascii output
get_filename_component(OTB_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)
diff --git a/CI/prepare_superbuild.cmake b/CI/prepare_superbuild.cmake
index 7a1bd0dc2d..da820a2386 100644
--- a/CI/prepare_superbuild.cmake
+++ b/CI/prepare_superbuild.cmake
@@ -75,7 +75,7 @@ ctest_update( SOURCE "${OTB_SOURCE_DIR}" )
set(CTEST_BUILD_FLAGS "-j16")
set ( SB_CONFIGURE_OPTIONS "")
-include( "${CMAKE_CURRENT_LIST_DIR}/../SuperBuild/CI/configure_options.cmake" )
+include( "${CMAKE_CURRENT_LIST_DIR}/sb_configure_options.cmake" )
ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}"
SOURCE "${SUPERBUILD_SOURCE_DIR}"
diff --git a/SuperBuild/CI/configure_options.cmake b/CI/sb_configure_options.cmake
similarity index 100%
rename from SuperBuild/CI/configure_options.cmake
rename to CI/sb_configure_options.cmake
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index 27f42a751b..a4d361d3ae 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -18,8 +18,6 @@
# limitations under the License.
#
-## COMMMENT to dirty superbuild artifact. TAG: 1.
-
cmake_minimum_required(VERSION 3.3.0)
project(OTB-SuperBuild)
--
GitLab