[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kidletime] /: Build on Mac OS X
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2014-03-06 19:40:11
Message-ID: E1WLe9L-0002pM-NY () scm ! kde ! org
[Download RAW message or body]

Git commit 9db2d78a13cb90d1e7775ad92faab1ac2bee21e2 by Harald Fernengel.
Committed on 06/03/2014 at 19:39.
Pushed by harald into branch 'master'.

Build on Mac OS X

M  +10   -6    CMakeLists.txt
M  +1    -0    src/CMakeLists.txt

http://commits.kde.org/kidletime/9db2d78a13cb90d1e7775ad92faab1ac2bee21e2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03136ea..d44cd34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 =

 include(FeatureSummary)
+include(CMakeFindFrameworks)
 include(GenerateExportHeader)
 include(ECMPackageConfigHelpers)
 include(ECMSetupVersion)
@@ -27,16 +28,19 @@ include(KDECMakeSettings)
 set(REQUIRED_QT_VERSION 5.2.0)
 find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
 =

-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras DBus)
 endif()
 =

-if (APPLE)
-   find_package(Carbon REQUIRED)
-endif ()
+if(APPLE)
+    cmake_find_frameworks(CoreFoundation Carbon)
+endif()
+
+if(NOT APPLE)
+    find_package(X11)
+    find_package(XCB COMPONENTS XCB)
+endif()
 =

-find_package(X11)
-find_package(XCB COMPONENTS XCB)
 if(X11_FOUND)
     find_package(XCB COMPONENTS XCB SYNC)
     find_package(X11_XCB)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ac1698f..b6b1629 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,6 +27,7 @@ if (X11_FOUND)
    set(kidletime_LIBS ${kidletime_LIBS} ${X11_LIBRARIES} Qt5::X11Extras)
 elseif (APPLE)
    set(kidletime_LIB_SRCS ${kidletime_LIB_SRCS} macpoller.cpp)
+   set(kidletime_LIBS "-framework CoreFoundation -framework Carbon")
 elseif (WIN32)
    set(kidletime_LIB_SRCS ${kidletime_LIB_SRCS} windowspoller.cpp)
 endif ()
[prev in list] [next in list] [prev in thread] [next in thread]