From 3c7f55855b45168818ef6fc5e58b30f1c7e4d133 Mon Sep 17 00:00:00 2001 From: renatofilho Date: Thu, 7 Oct 2010 12:15:11 -0300 Subject: Moved cmake macros to a separeted file. Reviewer: Hugo Parente Lima Luciano Wolf --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e7091b9e6..db5ca01e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,17 @@ -include(icecc.cmake) # this must be the first line! +include(cmake/Macros/icecc.cmake) # this must be the first line! project(pysidebindings) cmake_minimum_required(VERSION 2.6) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/ + ${CMAKE_SOURCE_DIR}/cmake/Macros/ ${CMAKE_MODULE_PATH}) find_package(PythonLibs REQUIRED) find_package(PythonInterpWithDebug REQUIRED) find_package(GeneratorRunner 0.6 REQUIRED) find_package(Shiboken 0.5 REQUIRED) find_package(Qt4 4.5.0 REQUIRED) +include(FindQt4Extra) set(XVFB_EXEC "") option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtGui tests popping windows on the screen." FALSE) -- cgit v1.2.3