error: fix libuv and code-gen bugs

ElektraInitiative · Jun 22, 2019 · 2fb2b17 · 2fb2b17
1 parent 969bea4
commit 2fb2b17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/include/elektra/error.h b/src/include/elektra/error.h
@@ -9,6 +9,7 @@
 #ifndef ELEKTRA_ERROR_H
 #define ELEKTRA_ERROR_H
 
+#include "types.h"
 #include <kdb.h>
 #include <stdbool.h>
 
@@ -28,6 +29,10 @@ const char * elektraErrorDescription (const ElektraError * error);
 
 void elektraErrorReset (ElektraError ** error);
 
+// for code-generation
+ElektraError * elektraErrorConversionToString (KDBType sourceType, const char * keyname);
+ElektraError * elektraErrorConversionFromString (KDBType targetType, const char * keyname, const char * sourceValue);
+
 #ifdef __cplusplus
 }
 #undef Key

diff --git a/src/include/kdbprivate.h b/src/include/kdbprivate.h
@@ -662,8 +662,6 @@ ElektraError * elektraErrorFromKey (Key * key);
 ElektraError * elektraErrorKeyNotFound (const char * keyname);
 ElektraError * elektraErrorWrongType (const char * keyname, KDBType expectedType, KDBType actualType);
 ElektraError * elektraErrorNullError (const char * function);
-ElektraError * elektraErrorConversionToString (KDBType sourceType, const char * keyname);
-ElektraError * elektraErrorConversionFromString (KDBType targetType, const char * keyname, const char * sourceValue);
 
 #ifdef __cplusplus
 }

diff --git a/src/plugins/zeromqrecv/CMakeLists.txt b/src/plugins/zeromqrecv/CMakeLists.txt
@@ -20,9 +20,9 @@ add_plugin (zeromqrecv
 if (ADDTESTING_PHASE)
 	check_binding_was_added ("io_uv" IS_INCLUDED)
 	if (BUILD_TESTING AND IS_INCLUDED)
-		if (BUILD_FULL OR BUILD_STATIC)
-			find_package (libuv 1 QUIET) # libuv is present; otherwise io_uv bindings would not be added
+		find_package (libuv QUIET) # libuv is present; otherwise io_uv bindings would not be added
 
+		if (BUILD_FULL OR BUILD_STATIC)
 			set (STATIC_LIBRARIES ${libuv_LIBRARIES})
 		endif ()