From 3d79abb106ee1b337806097d40fe98a333829a7e Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 15 Apr 2014 20:55:26 -0400 Subject: [PATCH] Portability - Fixed cmake issues on NetBSD (thanks to atomicules). --- AUTHORS | 1 + CMakeLists.txt | 6 ++++++ src/Directory.cpp | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index b13f74bad..1d87fc60b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -103,6 +103,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Jochen Sprickerhof Alexander Sulfrian David Binderman + atomicules Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/CMakeLists.txt b/CMakeLists.txt index 763f2bbd8..9e10ecf5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,12 @@ else (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set (UNKNOWN true) endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") +if (NETBSD) + #Since readline, etc likely to be in /usr/pkg/lib, not standard library + #Otherwise will remove links during install + set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +endif (NETBSD) + if (FREEBSD) 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") diff --git a/src/Directory.cpp b/src/Directory.cpp index 196538fdb..2cbe0d7af 100644 --- a/src/Directory.cpp +++ b/src/Directory.cpp @@ -34,7 +34,7 @@ #include #include -#ifdef SOLARIS +#if defined SOLARIS || defined NETBSD #include #endif