[c89stringutils/c89stringutils_string_extras.h] Fix DLL exposure ; [c89stringutils_tests/test_c89stringutils/CMakeLists.txt] Upgrade greatest.h test library ; [CMakeLists.txt] Support for MinGW and Cygwin ; [README.md] Embolden operating systems

Author: SamuelMarks

CMakeLists.txt

@@ -32,15 +32,18 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
     )
 endif (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
 # Set the build directories
-if (MSVC)
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows"
+        OR CMAKE_SYSTEM_NAME STREQUAL "CYGWIN"
+        OR CMAKE_SYSTEM_NAME MATCHES "MINGW.*")
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 else ()
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-endif()
+endif ()
+
 # configure a header file to pass the version number only
 configure_file(
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in"

README.md

@@ -7,15 +7,15 @@ c89stringutils
 
 C89 is missing some nice things. As is MSVC.
 This adds the string related functionality for:
-- Windows
+- **Windows**
   - MSVC 2005
   - MSVC 2022 (should support all other versions also)
   - MinGW
-  - Open Watcom 2.0 (including DOS target)
-- SunOS
-- Linux
-- BSD
-- macOS
+  - Open Watcom 2.0 (including **DOS** target)
+- **SunOS**
+- **Linux**
+- ***BSD**
+- **macOS**
 
 Everything is hidden behind `ifdef`s so if the compiler/OS supports the function, that function will be used instead of the one provided by this library.
 

c89stringutils/c89stringutils_string_extras.h

@@ -9,6 +9,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include "c89stringutils_export.h"
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ||     \
     defined(__bsdi__) || defined(__DragonFly__) || defined(BSD)
@@ -69,13 +70,6 @@
 #endif /* defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ||           \
           defined(__NT__) */
 
-#if OLD_MSVC || defined(__WATCOMC__) || defined(__CYGWIN__)
-#ifdef C89STRINGUTILS_EXPORT
-#undef C89STRINGUTILS_EXPORT
-#endif /* C89STRINGUTILS_EXPORT */
-#define C89STRINGUTILS_EXPORT __declspec(dllimport)
-#endif
-
 #if defined(__STDC_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__
 
 #define HAVE_STRERRORLEN_S

c89stringutils_tests/test_c89stringutils/CMakeLists.txt

@@ -8,14 +8,14 @@ string(REPLACE " " "_" EXEC_NAME "${EXEC_NAME}")
 set(DOWNLOAD_DIR "${PROJECT_BINARY_DIR}/test_downloads")
 file(MAKE_DIRECTORY "${DOWNLOAD_DIR}")
 
-set(GREATEST_SHA256 "aaea21b1f4f2a4be6c83109a53db910781d294d80cb36aafaa1b37c888ac883d")
+set(GREATEST_SHA256 "b3f89ecad2301c64c580f328cc03a74d92f4cd4bf42ab18d3d4bfb7b8be5b948")
 if (NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     file(DOWNLOAD "https://raw.githubusercontent.com/SamuelMarks/greatest/cmake-and-msvc/greatest.h"
             "${DOWNLOAD_DIR}/greatest.h")
     file(SHA256 "${DOWNLOAD_DIR}/greatest.h" GREATEST_SHA256_FOUND)
     if (NOT GREATEST_SHA256_FOUND STREQUAL GREATEST_SHA256)
-        message(FATAL_ERROR "SHA256 hash verification failed for \"${DOWNLOAD_DIR}/greatest.h\"\n
-                             \"${GREATEST_SHA256_FOUND}\" != \"${GREATEST_SHA256}\"")
+        message(FATAL_ERROR "SHA256 hash verification failed for \"${DOWNLOAD_DIR}/greatest.h\"
+                             \n\"${GREATEST_SHA256_FOUND}\" != \"${GREATEST_SHA256}\"")
     endif (NOT GREATEST_SHA256_FOUND STREQUAL GREATEST_SHA256)
 endif (NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 
@@ -33,7 +33,7 @@ add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
 
 target_link_libraries("${EXEC_NAME}" PRIVATE "c89stringutils")
 if (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
-    target_link_libraries("${EXEC_NAME}" PRIVATE "c89stringutils_compiler_flags" "c89stringutils")
+    target_link_libraries("${EXEC_NAME}" PRIVATE "c89stringutils_compiler_flags")
 endif (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
 target_include_directories(
         "${EXEC_NAME}"