some consistency improvements in the cmake files

Author: nlitsme

cmake_find/Finditslib.cmake

@@ -1,7 +1,7 @@
 if (TARGET itslib)
     return()
 endif()
-find_path(ITSLIB_PATH NAMES include/itslib/stringutils.h PATHS symlinks/itslib)
+find_path(ITSLIB_PATH NAMES include/itslib/stringutils.h PATHS ${CMAKE_SOURCE_DIR}/symlinks/itslib)
 if(ITSLIB_PATH STREQUAL "ITSLIB_PATH-NOTFOUND")
     include(FetchContent)
     FetchContent_Populate(itslib

cmake_find/Findopenssl.cmake

@@ -3,7 +3,7 @@ if (TARGET openssl_ssl)
 endif()
 if (DARWIN)
     find_path(OPENSSL_INCLUDE_PATH NAMES openssl/sha.h
-        PATHS $ENV{OPENSSL_ROOT_DIR}/include /usr/include /usr/local/include /usr/local/opt/openssl/include)
+        PATHS $ENV{OPENSSL_ROOT_DIR}/include /usr/local/opt/openssl/include /usr/include /usr/local/include)
     find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto 
         PATHS $ENV{OPENSSL_ROOT_DIR}/lib /usr/local/opt/openssl/lib /usr/lib /usr/local/lib)
     find_library(OPENSSL_SSL_LIBRARY NAMES ssl 
@@ -26,7 +26,7 @@ else()
     endif()
 
     find_path(OPENSSL_INCLUDE_PATH NAMES openssl/sha.h
-        PATHS /usr/include /usr/local/include /usr/local/opt/openssl/include)
+        PATHS /usr/local/opt/openssl/include /usr/include /usr/local/include)
     find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto 
         PATHS /usr/local/opt/openssl/lib /usr/lib /usr/local/lib)
     find_library(OPENSSL_SSL_LIBRARY NAMES ssl 

cmake_find/Findzlib.cmake

@@ -1,15 +1,23 @@
-include(FetchContent)
-FetchContent_Populate(zlib
-    # TODO: we need a method of supplying a local cache of this file.
-    URL https://www.zlib.net/zlib-1.3.tar.gz
-    URL_HASH SHA256=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
-)
-set(ZLIBDIR ${CMAKE_BINARY_DIR}/zlib-src)
+find_path(ZLIB_DIR NAMES inftrees.c PATHS ${CMAKE_SOURCE_DIR}/symlinks/zlib)
+if(ZLIB_DIR STREQUAL "ZLIB_DIR-NOTFOUND")
+    include(FetchContent)
+    FetchContent_Populate(zlib
+        # TODO: we need a method of supplying a local cache of this file.
+        URL https://www.zlib.net/zlib-1.3.tar.gz
+        URL_HASH SHA256=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
+    )
+    set(ZLIB_DIR ${CMAKE_BINARY_DIR}/zlib-src)
+else()
+    set(zlib_BINARY_DIR ${CMAKE_BINARY_DIR}/zlib-build)
+endif()
+
 
 list(APPEND ZLIBFILES inftrees.c infback.c compress.c inffast.c adler32.c uncompr.c inflate.c deflate.c crc32.c trees.c zutil.c)
 #list(APPEND ZLIBFILES gzclose.c gzread.c gzwrite.c gzlib.c)  <-- build failure on macos because of missing include <unistd.h>
-list(TRANSFORM ZLIBFILES PREPEND ${ZLIBDIR}/)
+list(TRANSFORM ZLIBFILES PREPEND ${ZLIB_DIR}/)
 add_library(zlib ${LIBSTYLE} ${ZLIBFILES})
-target_include_directories(zlib PUBLIC ${ZLIBDIR})
+target_include_directories(zlib PUBLIC ${ZLIB_DIR})
 
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(zlib REQUIRED_VARS ZLIB_DIR)
 

cmake_find/boilerplate.cmake

@@ -54,15 +54,18 @@ endif()
 
 if (OPT_ANALYZE)
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        # see https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Static-Analyzer-Options.html#index-analyzer
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fanalyzer")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        # https://clang.llvm.org/docs/UsersManual.html
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --analyze")
     endif()
 endif()
 
 if (OPT_ASAN AND OPT_TSAN)
     message(FATAL_ERROR "Only one sanitizer can be active at a time")
 elseif (OPT_ASAN)
+    # https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Instrumentation-Options.html#index-fsanitize_003daddress
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
     #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
@@ -160,7 +163,7 @@ if(MSVC)
     # NOBITMAP - avoid error in mmreg.h
     # NOMINMAX - remove 'max()' macro from global namespace
     # NOGDI - ...
-    add_definitions(-DNOMINMAX -DNOGDI -DNOBITMAP)
+    add_definitions(-DNOMINMAX -DNOGDI -DNOBITMAP -DWIN32_LEAN_AND_MEAN)
     add_definitions(-DWIN32)
     add_definitions(-D__STDC_WANT_SECURE_LIB__=1)