From c81dd1c3c37e5dcce2fc47f038772ed542cdf8e7 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 26 Jan 2012 10:17:17 +0000 Subject: [PATCH] Require CMake>=2.8.6 on Windows platforms --- Installation/CMakeLists.txt | 8 ++++++-- Installation/doc_tex/Installation/installation.tex | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 0afa6cfddcb..3380468b689 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -3,10 +3,14 @@ # refer to the root source directory of the project as ${CMAKE_SOURCE_DIR} or # ${CMAKE_SOURCE_DIR} and to the root binary directory of the project as # ${CMAKE_BINARY_DIR} or ${CMAKE_BINARY_DIR}. -project(CGAL) +project(CGAL CXX) # Minimal version of CMake: -cmake_minimum_required(VERSION 2.6.2) +if(WIN32) + cmake_minimum_required(VERSION 2.6.2) +else(WIN32) + cmake_minimum_required(VERSION 2.8.6) +endif() # Tested version: if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index 400129921a5..cb87dd172ce 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -96,7 +96,9 @@ In order to build the \cgal\ libraries, you need a \CC\ compiler. In order to configure, build, and install the \cgal\ libraries, examples and demos, you need \cmake, a cross-platform ``makefile generator''. If \cmake\ is not installed already you can obtain it from \cmakepage. -\cmake\ version~2.6.2 or higher is required. +\cmake\ version~2.6.2 or higher is required. On Windows, \cmake{} +version~2.8.6 or higher is required, for a proper support of DLLs +generation.