X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=CMakeLists.txt;h=6cdd59fda960eff4f27aed21aaa766bd7e049b14;hb=c371e27b23667e05cccffb200acfb35f5af2a64a;hp=3170180eeb2b22ef40ec9558b3be8cf894447815;hpb=1fde33939ee9337bca69bc60ad8f1f686b2707b9;p=quassel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3170180e..6cdd59fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,8 @@ project(QuasselIRC) include(CheckFunctionExists) include(CheckIncludeFile) -# cmake 2.6.2 is required for KDE >=4.2 and should be widespread enough now # For building against Qt5, we check for an even newer cmake version below! -cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.1 FATAL_ERROR) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) @@ -142,10 +141,10 @@ endif(CMAKE_COMPILER_IS_GNUCXX) # Mac build stuff if(APPLE AND DEPLOY) - set(CMAKE_OSX_ARCHITECTURES "i386;ppc") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4") - set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/") - add_definitions(-DMAC_10_4_SDK) + set(CMAKE_OSX_ARCHITECTURES "x86_64") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6") + set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk/") + add_definitions(-DMAC_10_6_SDK) endif(APPLE AND DEPLOY) # Simplify checks @@ -199,7 +198,7 @@ else(WITH_QT5) endif(QT) # Now that we have the correct $PATH, lets find Qt! - find_package(Qt4 REQUIRED) + find_package(Qt4 ${QT_MIN_VERSION} REQUIRED) endif(WITH_QT5)