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

List:       kde-commits
Subject:    [kcrash] /: Build on Mac OS X
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2014-02-14 19:47:21
Message-ID: E1WEOjJ-0000Lf-1p () scm ! kde ! org
[Download RAW message or body]

Git commit 537f9195eb3959acd72e2a71201f3b2e8c6ed460 by Harald Fernengel.
Committed on 14/02/2014 at 19:46.
Pushed by harald into branch 'master'.

Build on Mac OS X

Do not go looking or X11, and include errno.h where needed

M  +4    -1    CMakeLists.txt
M  +1    -0    autotests/test_crasher.cpp
M  +1    -0    src/kcrash.cpp

http://commits.kde.org/kcrash/537f9195eb3959acd72e2a71201f3b2e8c6ed460

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddf5fb3..1e02b1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,10 @@ include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings)
 include(KDECMakeSettings)
 =

-find_package(X11)
+if (NOT APPLE)
+    find_package(X11)
+endif()
+
 set(HAVE_X11 ${X11_FOUND})
 =

 include(FeatureSummary)
diff --git a/autotests/test_crasher.cpp b/autotests/test_crasher.cpp
index 75ac7c6..89be1ff 100644
--- a/autotests/test_crasher.cpp
+++ b/autotests/test_crasher.cpp
@@ -23,6 +23,7 @@
 #include <kcrash.h>
 #ifdef Q_OS_UNIX
 #include <sys/resource.h> // setrlimit
+#include <errno.h>
 #endif
 =

 QFile output;
diff --git a/src/kcrash.cpp b/src/kcrash.cpp
index c3a234a..745375d 100644
--- a/src/kcrash.cpp
+++ b/src/kcrash.cpp
@@ -36,6 +36,7 @@
 #ifndef Q_OS_WIN
 #include <sys/resource.h>
 #include <sys/un.h>
+#include <errno.h>
 #else
 #include <qt_windows.h>
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]