From 018770e8942e344b2b253221a44fa3401479decc Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 10 Dec 2017 00:20:50 -0500 Subject: [PATCH] TI-91: Timewarrior does not compile on DragonFly - Thanks to Michael Neumann. --- AUTHORS | 1 + CMakeLists.txt | 6 +++--- ChangeLog | 2 ++ cmake.h.in | 1 + cmake/CXXSniffer.cmake | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index a305aeaba..ab810b47e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -140,6 +140,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Lukas Barth Øyvind A. Holm Paul J. Fenwick + Michael Neumann Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c49533d0..e7d2a67e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,13 +48,13 @@ set (PACKAGE_TARNAME "${PACKAGE}") set (PACKAGE_VERSION "${VERSION}") set (PACKAGE_STRING "${PACKAGE} ${VERSION}") -if (FREEBSD) +if (FREEBSD OR DRAGONFLY) SET (TASK_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1") SET (TASK_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5") -else (FREEBSD) +else (FREEBSD OR DRAGONFLY) SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1") SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5") -endif (FREEBSD) +endif (FREEBSD OR DRAGONFLY) SET (TASK_DOCDIR share/doc/task CACHE STRING "Installation directory for doc files") SET (TASK_RCDIR "${TASK_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files") SET (TASK_BINDIR bin CACHE STRING "Installation directory for the binary") diff --git a/ChangeLog b/ChangeLog index 6db9753ae..aa08e7819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ - TD-64 sync conflict deleted all annotations of the task (thanks to Markus Beppler, Konstantin Vorobyev). +- TI-91 Timewarrior does not compile on DragonFly + (thanks to Michael Neumann). - TW-61 Extract only tasks with annotations (thanks to Aikido Guy). - TW-213 Align countdown column on boundary between number and text. diff --git a/cmake.h.in b/cmake.h.in index 0041e6ea7..aee21418f 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -43,6 +43,7 @@ #cmakedefine FREEBSD #cmakedefine OPENBSD #cmakedefine NETBSD +#cmakedefine DRAGONFLY #cmakedefine HAIKU #cmakedefine SOLARIS #cmakedefine KFREEBSD diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake index 96062263b..b6aa56dc7 100644 --- a/cmake/CXXSniffer.cmake +++ b/cmake/CXXSniffer.cmake @@ -33,6 +33,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") set (OPENBSD true) elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") set (NETBSD true) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") + set (DRAGONFLY true) elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") set (SOLARIS true) elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")