Rex Dieter e5f144c
From 218d6c49c2fb8854ea677e9afad69bd08720ea41 Mon Sep 17 00:00:00 2001
Rex Dieter e5f144c
From: Montel Laurent <montel@kde.org>
Rex Dieter e5f144c
Date: Sun, 20 Apr 2014 07:39:18 +0200
Rex Dieter e5f144c
Subject: [PATCH 1/9] Add automoc, increase cmake version
Rex Dieter e5f144c
Rex Dieter e5f144c
---
Rex Dieter e5f144c
 CMakeLists.txt | 8 +++++++-
Rex Dieter e5f144c
 1 file changed, 7 insertions(+), 1 deletion(-)
Rex Dieter e5f144c
Rex Dieter e5f144c
diff --git a/CMakeLists.txt b/CMakeLists.txt
Rex Dieter e5f144c
index c9468c5..479c563 100644
Rex Dieter e5f144c
--- a/CMakeLists.txt
Rex Dieter e5f144c
+++ b/CMakeLists.txt
Rex Dieter e5f144c
@@ -1,11 +1,17 @@
Rex Dieter e5f144c
 project(prison)
Rex Dieter e5f144c
-cmake_minimum_required(VERSION 2.6)
Rex Dieter e5f144c
+cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
Rex Dieter e5f144c
+
Rex Dieter e5f144c
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
Rex Dieter e5f144c
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
Rex Dieter e5f144c
 
Rex Dieter e5f144c
 find_package(Qt4 REQUIRED)
Rex Dieter e5f144c
 find_package(QRencode REQUIRED)
Rex Dieter e5f144c
 find_package(Dmtx REQUIRED)
Rex Dieter e5f144c
 
Rex Dieter e5f144c
+# Enable CMake's Automoc
Rex Dieter e5f144c
+set(CMAKE_AUTOMOC ON)
Rex Dieter e5f144c
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
Rex Dieter e5f144c
+
Rex Dieter e5f144c
 
Rex Dieter e5f144c
 include_directories(${CMAKE_SOURCE_DIR}/lib ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} )
Rex Dieter e5f144c
 
Rex Dieter e5f144c
-- 
Rex Dieter e5f144c
2.5.0
Rex Dieter e5f144c