From f2727399e99a5f36b5b4e113e4c53d4e60d52406 Mon Sep 17 00:00:00 2001 From: Anton Adamansky Date: Fri, 20 Mar 2015 15:38:22 +0600 Subject: [PATCH] rt lib depenedency on MacOS --- src/CMakeLists.txt | 7 +++---- src/ejdb/ejdb.c | 5 ++--- src/tcutil/tcutil.h | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ac32d7..a7eef76 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,12 +68,11 @@ if (NOT WIN32) list(APPEND EJDB_LLIBRARIES ${CMAKE_THREAD_LIBS_INIT}) endif() -if (APPLE) find_library(RT_LIB rt) - if (NOT RT_LIB) - message(FATAL_ERROR "Library 'librt' not FOUND") - endif() +if (RT_LIB) list(APPEND EJDB_LLIBRARIES "${RT_LIB}") +else() + message(WARNING "Library 'librt' not FOUND") endif() find_library(M_LIB m) diff --git a/src/ejdb/ejdb.c b/src/ejdb/ejdb.c index 0a9a814..aecf605 100644 --- a/src/ejdb/ejdb.c +++ b/src/ejdb/ejdb.c @@ -163,7 +163,7 @@ extern const char *utf8proc_errmsg(ssize_t errcode); static const bool yes = true; const char *ejdbversion() { - return _TC_VERSION; + return tcversion; } const char* ejdberrmsg(int ecode) { @@ -286,8 +286,7 @@ bool ejdbisopen(EJDB *jb) { } bool ejdbopen(EJDB *jb, const char *path, int mode) { - assert(jb && path); - assert(jb->metadb); + assert(jb && path && jb->metadb); if (!JBLOCKMETHOD(jb, true)) return false; if (JBISOPEN(jb)) { _ejdbsetecode(jb, TCEINVALID, __FILE__, __LINE__, __func__); diff --git a/src/tcutil/tcutil.h b/src/tcutil/tcutil.h index b1bb329..3709262 100644 --- a/src/tcutil/tcutil.h +++ b/src/tcutil/tcutil.h @@ -3720,7 +3720,6 @@ typedef unsigned char TCBITMAP; /* type of a bit map object */ #include -#define _TC_VERSION "1.1.26" #define _TC_LIBVER 911 #define _TC_FORMATVER "1.0" -- 2.7.4