From 0b26128f40822975172b9ffd06f09f12e3030963 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 10 Dec 2017 00:17:09 -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 437429c..9f03366 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,6 +9,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Jörg Krause Ben Boeckel 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 1cbc519..7cd730c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,13 +17,13 @@ set (PACKAGE_TARNAME "${PACKAGE}") set (PACKAGE_VERSION "${VERSION}") set (PACKAGE_STRING "${PACKAGE} ${VERSION}") -if (FREEBSD) +if (FREEBSD OR DRAGONFLY) SET (FLOD_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1") SET (FLOD_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5") -else (FREEBSD) +else (FREEBSD OR DRAGONFLY) SET (FLOD_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1") SET (FLOD_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5") -endif (FREEBSD) +endif (FREEBSD OR DRAGONFLY) SET (FLOD_DOCDIR share/doc/flod CACHE STRING "Installation directory for doc files") message ("-- Looking for pthread") diff --git a/ChangeLog b/ChangeLog index 941cbd8..686d5b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ - TD-120 Missing cmakedefine for HAVE_GET_CURRENT_DIR_NAME (Thanks to Jörg Krause, Ben Boeckel). +- TI-91 Timewarrior does not compile on DragonFly + (thanks to Michael Neumann). - TW-1845 Cygwin build fails, missing get_current_dir_name (thanks to hosaka). - TW-1936 Tweak tests to have fuller TAP compliance diff --git a/cmake.h.in b/cmake.h.in index 7e89873..2dd894f 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -25,6 +25,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 9606226..b6aa56d 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")