diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake index 92646a44efdccd1ac0ae19910c1b7164551d3aee..246b9f780f2c67bc89925f3f247121fcd2e0a5c8 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 7a1bd0dc2d97588931c0437ec5efec7142c78f9f..da820a238642f6894ddb3d127274863ab4ddeb09 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 27f42a751b0c8966d6775369645e9c39a43b6b80..a4d361d3aecbe6c35fd496837d27b1db35070653 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)