r14988 by cbradney - Bring forward minimum CMake version to 1.5.0svn

scribus-commit scribus-commit at lists.scribus.net
Mon Apr 19 20:40:17 CEST 2010


Revision: 14988
Author: cbradney
Date: 2010-04-19T18:33:22.397026Z
Commit message: Bring forward minimum CMake version to 1.5.0svn

Changeset: 
M  /trunk/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14987)
+++ CMakeLists.txt	(revision 14988)
@@ -4,13 +4,13 @@
 #Set our CMake minimum version
 #Require 2.4.2 for Qt finding
 #Require 2.4.3 for moc change detection and rpath updates for custom cairo install
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 
-IF(WIN32)
-  IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.6)
-    MESSAGE(FATAL_ERROR "Windows builds require CMake 2.6")
-  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.6)
-ENDIF(WIN32)
+#IF(WIN32)
+#  IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.6)
+#    MESSAGE(FATAL_ERROR "Windows builds require CMake 2.6")
+#  ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.6)
+#ENDIF(WIN32)
 
 #Pretty colors
 SET(CMAKE_COLOR_MAKEFILE ON)




More information about the scribus-commit mailing list