CMakeLists.txt

@@ -187,10 +187,11 @@ endif()
 find_package(Threads REQUIRED)
 find_package(git)
 find_package(eigen REQUIRED)
-include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
+include_directories(SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
+include_directories(SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/external/optionparser-1.4")
 if (USE_LZ4 MATCHES "ON")
     find_package(RQ_LZ4 REQUIRED)
-    include_directories(SYSTEM ${RQ_LZ4_INCLUDE_DIR})
+    include_directories(SYSTEM PUBLIC ${RQ_LZ4_INCLUDE_DIR})
     add_definitions(-DRQ_USE_LZ4)
 endif()
 #lz4 build if necessary

external/build_deps.cmake

@@ -58,7 +58,7 @@ if(RQ_BUILD_LZ4)
         SOVERSION "${RQ_LZ4_VERSION_MAJOR}.${RQ_LZ4_VERSION_MINOR}")
     #set_property(TARGET lz4_static PROPERTY LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
     ADD_DEFINITIONS("-DLZ4_VERSION=\"${RQ_LZ4_VERSION_PATCH}\"")
-    INCLUDE_DIRECTORIES (${RQ_LZ4_DIR})
+    INCLUDE_DIRECTORIES (SYSTEM PUBLIC ${RQ_LZ4_DIR})
 
     # NOTE: will be used like "-Wl..flag,flag,flag" . no spaces, and keep the comma
     set(RQ_LZ4_EXCLUDE_SYM ",--exclude-libs lib${RQ_LZ4_LIBNAME}.a")

src/RaptorQ/v1/common.hpp

@@ -97,7 +97,7 @@
 #include <cstdint>
 #include <type_traits>
 //windows does not have ssize_t
-typedef std::conditional<sizeof(size_t) == 4, int32_t, int64_t>::type ssize_t;
+typedef std::make_signed<size_t>::type ssize_t;
 #endif
 
 static const uint64_t RFC6330_max_data = 946270874880;  // ~881 GB

src/cli/RaptorQ.cpp

@@ -30,7 +30,7 @@
 #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wcast-qual"
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#include "../external/optionparser-1.4/optionparser.h"
+#include "optionparser.h"
 #pragma clang diagnostic pop
 #pragma GCC diagnostic pop
 #include "RaptorQ/RaptorQ_v1_hdr.hpp"