diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-01-23 19:34:08 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-01-23 19:35:17 +0300 |
| commit | b856266e91e9d02f249bca6132e3acfea5eb38a3 (patch) | |
| tree | 5bf9ac1c3f08c9fef31b001645b597450b40d279 /csync | |
| parent | 7f1f62e14a5ab2ed8cb54cd3c26cffe6e894db51 (diff) | |
Remove neon link flag when not required
Diffstat (limited to 'csync')
| -rw-r--r-- | csync/src/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | csync/src/csync_owncloud.c | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/csync/src/CMakeLists.txt b/csync/src/CMakeLists.txt index e94b32c70..57316b6d0 100644 --- a/csync/src/CMakeLists.txt +++ b/csync/src/CMakeLists.txt @@ -1,7 +1,9 @@ project(libcsync) add_subdirectory(std) -add_subdirectory(httpbf) +if(USE_NEON) + add_subdirectory(httpbf) +endif() # Statically include sqlite @@ -28,8 +30,6 @@ set(CSYNC_LINK_LIBRARIES ${CSTDLIB_LIBRARY} ${CSYNC_REQUIRED_LIBRARIES} ${SQLITE3_LIBRARIES} - ${NEON_LIBRARIES} - ${HTTPBF_LIBRARY} ) if(HAVE_ICONV AND WITH_ICONV) @@ -67,6 +67,9 @@ if(USE_NEON) csync_owncloud.c csync_owncloud_util.c ) + list(APPEND CSYNC_LINK_LIBRARIES + ${NEON_LIBRARIES} + ) add_definitions(-DUSE_NEON) endif(USE_NEON) diff --git a/csync/src/csync_owncloud.c b/csync/src/csync_owncloud.c index 09e2ca646..14b6d8822 100644 --- a/csync/src/csync_owncloud.c +++ b/csync/src/csync_owncloud.c @@ -514,6 +514,7 @@ void owncloud_destroy(CSYNC* ctx) owncloud_commit(ctx); SAFE_FREE(ctx->owncloud_context); ctx->owncloud_context = 0; + ne_sock_exit(); } int owncloud_set_property(CSYNC* ctx, const char *key, void *data) { @@ -558,6 +559,8 @@ int owncloud_set_property(CSYNC* ctx, const char *key, void *data) { void owncloud_init(CSYNC* ctx) { + ne_sock_init(); + ctx->owncloud_context = c_malloc( sizeof( struct csync_owncloud_ctx_s )); ctx->owncloud_context->csync_ctx = ctx; // back reference |