mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-18 15:33:08 +02:00
Bug
- Fixed platform detection of OpenBSD and NetBSD
This commit is contained in:
parent
a469a2c6d5
commit
16bef4a29e
5 changed files with 17 additions and 6 deletions
|
@ -20,6 +20,10 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
set (DARWIN true)
|
set (DARWIN true)
|
||||||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||||
set (FREEBSD true)
|
set (FREEBSD true)
|
||||||
|
elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
|
||||||
|
set (OPENBSD true)
|
||||||
|
elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
|
||||||
|
set (NETBSD true)
|
||||||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
|
elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
|
||||||
set (SOLARIS true)
|
set (SOLARIS true)
|
||||||
else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
|
|
|
@ -36,6 +36,7 @@ Override PACKAGE_LANGUAGE, then
|
||||||
#cmakedefine CYGWIN
|
#cmakedefine CYGWIN
|
||||||
#cmakedefine FREEBSD
|
#cmakedefine FREEBSD
|
||||||
#cmakedefine OPENBSD
|
#cmakedefine OPENBSD
|
||||||
|
#cmakedefine NETBSD
|
||||||
#cmakedefine HAIKU
|
#cmakedefine HAIKU
|
||||||
#cmakedefine SOLARIS
|
#cmakedefine SOLARIS
|
||||||
#cmakedefine WIN32
|
#cmakedefine WIN32
|
||||||
|
|
|
@ -138,12 +138,14 @@ const std::string DOM::get (const std::string& name)
|
||||||
return /*_cache[name] =*/ "Solaris";
|
return /*_cache[name] =*/ "Solaris";
|
||||||
#elif defined (CYGWIN)
|
#elif defined (CYGWIN)
|
||||||
return /*_cache[name] =*/ "Cygwin";
|
return /*_cache[name] =*/ "Cygwin";
|
||||||
#elif defined (OPENBSD)
|
|
||||||
return /*_cache[name] =*/ "OpenBSD";
|
|
||||||
#elif defined (HAIKU)
|
#elif defined (HAIKU)
|
||||||
return /*_cache[name] =*/ "Haiku";
|
return /*_cache[name] =*/ "Haiku";
|
||||||
|
#elif defined (OPENBSD)
|
||||||
|
return /*_cache[name] =*/ "OpenBSD";
|
||||||
#elif defined (FREEBSD)
|
#elif defined (FREEBSD)
|
||||||
return /*_cache[name] =*/ "FreeBSD";
|
return /*_cache[name] =*/ "FreeBSD";
|
||||||
|
#elif defined (NETBSD)
|
||||||
|
return /*_cache[name] =*/ "NetBSD";
|
||||||
#elif defined (LINUX)
|
#elif defined (LINUX)
|
||||||
return /*_cache[name] =*/ "Linux";
|
return /*_cache[name] =*/ "Linux";
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -82,12 +82,14 @@ int CmdDiagnostics::execute (std::string& output)
|
||||||
"Solaris"
|
"Solaris"
|
||||||
#elif defined (CYGWIN)
|
#elif defined (CYGWIN)
|
||||||
"Cygwin"
|
"Cygwin"
|
||||||
#elif defined (OPENBSD)
|
|
||||||
"OpenBSD"
|
|
||||||
#elif defined (HAIKU)
|
#elif defined (HAIKU)
|
||||||
"Haiku"
|
"Haiku"
|
||||||
|
#elif defined (OPENBSD)
|
||||||
|
"OpenBSD"
|
||||||
#elif defined (FREEBSD)
|
#elif defined (FREEBSD)
|
||||||
"FreeBSD"
|
"FreeBSD"
|
||||||
|
#elif defined (NETBSD)
|
||||||
|
"NetBSD"
|
||||||
#elif defined (LINUX)
|
#elif defined (LINUX)
|
||||||
"Linux"
|
"Linux"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -80,12 +80,14 @@ int CmdVersion::execute (std::string& output)
|
||||||
<< "solaris"
|
<< "solaris"
|
||||||
#elif defined (CYGWIN)
|
#elif defined (CYGWIN)
|
||||||
<< "cygwin"
|
<< "cygwin"
|
||||||
#elif defined (OPENBSD)
|
|
||||||
<< "openbsd"
|
|
||||||
#elif defined (HAIKU)
|
#elif defined (HAIKU)
|
||||||
<< "haiku"
|
<< "haiku"
|
||||||
|
#elif defined (OPENBSD)
|
||||||
|
<< "openbsd"
|
||||||
#elif defined (FREEBSD)
|
#elif defined (FREEBSD)
|
||||||
<< "freebsd"
|
<< "freebsd"
|
||||||
|
#elif defined (NETBSD)
|
||||||
|
<< "netbsd"
|
||||||
#elif defined (LINUX)
|
#elif defined (LINUX)
|
||||||
<< "linux"
|
<< "linux"
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue