Revision be3aae126e874ac2e41a6b3560fce121fb0f32f3 authored by Laurent Rineau on 01 April 2015, 15:56:25 UTC, committed by Laurent Rineau on 01 April 2015, 15:56:25 UTC
That fix explains why the integration branch was not reset correctly:
cgal-dev was not fetched, so cgal-dev/master was still pointing to a
commit made three weeks ago.
1 parent 6c6484e
Raw File
CMakeLists.txt
# Top level CMakeLists.txt for CGAL-branchbuild
message( "== CMake setup ==" )
project(CGAL CXX C)

# Minimal version of CMake:
if(WIN32)
  cmake_minimum_required(VERSION 2.8.6)
else()
  cmake_minimum_required(VERSION 2.6.2)
endif()

# option for branch build

option( CGAL_BRANCH_BUILD "Create CGAL from branch" ON)
mark_as_advanced( CGAL_BRANCH_BUILD )

include(${CMAKE_SOURCE_DIR}/Installation/cmake/modules/CGAL_SCM.cmake)

# add option for duplicate file detection
option( CGAL_REPORT_DUPLICATE_FILES "Switch on to start (naive) detection of duplicate source- and headerfiles in packages" OFF)

message( "== CMake setup (DONE) ==\n" )
# and finally start actual build
add_subdirectory( Installation )

# for releases, where dont_submit is honored
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Documentation")
  option(BUILD_DOC "Build the doxygen documentation" OFF)
  if (BUILD_DOC)
    add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/Documentation" )
  endif(BUILD_DOC)
endif()
back to top