MSVC fixes

Author: SamuelMarks

CMakeLists.txt

@@ -104,7 +104,9 @@ install(
         FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.h"
         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
-include(InstallRequiredSystemLibraries)
+if(CMAKE_HOST_WIN32)
+    include(InstallRequiredSystemLibraries)
+endif()
 set(CPACK_BUNDLE_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "Samuel Marks")
 set(CPACK_PACKAGE_DESCRIPTION "string functions from newer standards / common non-standards for C89")

c89stringutils/tests/CMakeLists.txt

@@ -31,7 +31,7 @@ source_group("Source Files" FILES "${Source_Files}")
 
 add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
 
-target_compile_definitions("${EXEC_NAME}" PRIVATE C89STRINGUTILS_TEST_MOCKS)
+target_compile_definitions("${EXEC_NAME}" PRIVATE C89STRINGUTILS_TEST_MOCKS C89STRINGUTILS_STATIC_DEFINE)
 
 if (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
     target_link_libraries("${EXEC_NAME}" PRIVATE "${PROJECT_NAME}_compiler_flags")

c89stringutils/tests/test.c

@@ -3,12 +3,17 @@
  * @brief Main entry point for greatest tests.
  */
 /* clang-format off */
+#if defined(_MSC_VER)
+#define _CRT_SECURE_NO_WARNINGS
+#endif
 #include <greatest.h>
 #include <c89stringutils_log.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include "test_string_extras.h"
+/* clang-format on */
 
 int g_mock_malloc_fail = 0;
 int g_mock_realloc_fail = 0;
@@ -17,12 +22,14 @@ int g_mock_vsnprintf_ret = 0;
 int g_mock_strerror_null = 0;
 
 void *mock_malloc(size_t size) {
-  if (g_mock_malloc_fail) return NULL;
+  if (g_mock_malloc_fail)
+    return NULL;
   return malloc(size);
 }
 
 void *mock_realloc(void *ptr, size_t size) {
-  if (g_mock_realloc_fail) return NULL;
+  if (g_mock_realloc_fail)
+    return NULL;
   return realloc(ptr, size);
 }
 
@@ -32,19 +39,19 @@ int g_mock_vsnprintf_ret2 = 0; /* for second call */
 
 int mock_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
   g_mock_vsnprintf_call_count++;
-  if (g_mock_vsnprintf_fail_call == g_mock_vsnprintf_call_count) return g_mock_vsnprintf_ret2;
-  if (g_mock_vsnprintf_fail) return g_mock_vsnprintf_ret < 0 ? -1 : g_mock_vsnprintf_ret;
+  if (g_mock_vsnprintf_fail_call == g_mock_vsnprintf_call_count)
+    return g_mock_vsnprintf_ret2;
+  if (g_mock_vsnprintf_fail)
+    return g_mock_vsnprintf_ret < 0 ? -1 : g_mock_vsnprintf_ret;
   return vsnprintf(str, size, format, ap);
 }
 
 char *mock_strerror(int errnum) {
-  if (g_mock_strerror_null) return NULL;
+  if (g_mock_strerror_null)
+    return NULL;
   return strerror(errnum);
 }
 
-#include "test_string_extras.h"
-/* clang-format on */
-
 /* Add definitions that need to be in the test runner's main file. */
 GREATEST_MAIN_DEFS();
 

c89stringutils/tests/test_string_extras.h

@@ -285,6 +285,7 @@ extern int g_mock_strerror_null;
 
 extern int g_mock_vsnprintf_fail_call;
 extern int g_mock_vsnprintf_call_count;
+extern int g_mock_vsnprintf_ret2;
 
 TEST x_mock_failures(void) {
   char *s = NULL;