X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=353511d376a4568c4cc6bdac5dcfd2d89e422520;hp=3170180eeb2b22ef40ec9558b3be8cf894447815;hb=0392d7e7892bafee907c2e5293700d67c9872fff;hpb=1fde33939ee9337bca69bc60ad8f1f686b2707b9 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3170180e..353511d3 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) @@ -69,6 +68,7 @@ option(STATIC "Enable static building (might not be portable)" OFF) if(APPLE) option(DEPLOY "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF) + option(WITH_NOTIFICATION_CENTER "Enable OS X Notification Center support" ON) endif(APPLE) # Default to embedding data in the static case @@ -142,10 +142,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 +199,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) @@ -371,6 +371,15 @@ if(BUILD_GUI) set(INDICATEQT_LIBRARIES "") endif(WITH_LIBINDICATE AND NOT WITH_QT5) + # Setup OS X notification center support + if(WITH_NOTIFICATION_CENTER AND APPLE) + set(HAVE_NOTIFICATION_CENTER true) + add_definitions(-DHAVE_NOTIFICATION_CENTER) + set(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} + /System/Library/Frameworks/Foundation.framework + ) + endif() + endif(BUILD_GUI) # Core-only deps