Merge pull request #12 from measurement-kit/release/v0.20.2

Release v0.20.2

Author: bassosimone

CMakeLists.txt

@@ -101,8 +101,8 @@ endif()
 # Library
 
 add_library(
-  ndt
-  STATIC
+  ndt_objects
+  OBJECT
   curlx.cpp
   curlx.hpp
   libndt.cpp
@@ -111,6 +111,16 @@ add_library(
   strtonum.h
 )
 target_include_directories(
+  ndt_objects PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+  ${CURL_INCLUDE_DIRS}
+)
+
+add_library(ndt $<TARGET_OBJECTS:ndt_objects>)
+target_include_directories(
+  # Duplicate includes of `ndt_objects` because when building binaries we do
+  # not use `ndt_objects`, so includes are not transitively picked up.
+  # TODO(bassosimone): we can perhaps do this using a generator expression
+  # but so far I have failed to do this properly.
   ndt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
   ${CURL_INCLUDE_DIRS}
 )

libndt.cpp

@@ -1042,6 +1042,7 @@ bool Client::query_mlabns_curl(const std::string &url, long timeout,
   }
   return true;
 #else
+  (void)url, (void)timeout, (void)body;
   EMIT_WARNING("cURL not compiled in; don't know how to get server");
   return false;
 #endif

libndt.hpp

@@ -27,7 +27,7 @@ namespace libndt {
 
 constexpr uint64_t api_major = 0;
 constexpr uint64_t api_minor = 20;
-constexpr uint64_t api_patch = 1;
+constexpr uint64_t api_patch = 2;
 
 constexpr uint8_t nettest_middlebox = 1 << 0;
 constexpr uint8_t nettest_upload = 1 << 1;