CMake: Make final fixes for Windows.

3 files changed, 13 insertions, 11 deletions

diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt
index 72a4c6dd..2f902c0d 100644
--- a/contrib/puff/CMakeLists.txt
+++ b/contrib/puff/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12...3.31)
 
 project(
     puff
-    VERSION 1.0.0
+    VERSION 2.3.0
     LANGUAGES C
     DESCRIPTION "A library for decompressing deflate with very little footprint"
     HOMEPAGE_URL "https://www.zlib.net")
@@ -83,7 +83,7 @@ if(ZLIB_PUFF_BUILD_SHARED)
                 EXPORT_NAME PUFF
                 OUTPUT_NAME puff)
 
-    if(ZLIB_PUFF_BUILD_TESTING)
+    if(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
         enable_testing()
 
         add_executable(zlib_puff_test pufftest.c puff.h)
@@ -113,7 +113,7 @@ if(ZLIB_PUFF_BUILD_SHARED)
                         ${GCOV_EXECUTABLE}
                         ${llvm_option})
         endif(GCOV_EXECUTABLE)
-    endif(ZLIB_PUFF_BUILD_TESTING)
+    endif(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
 endif(ZLIB_PUFF_BUILD_SHARED)
 
 if(ZLIB_PUFF_BUILD_STATIC)
@@ -128,7 +128,7 @@ if(ZLIB_PUFF_BUILD_STATIC)
             EXPORT_NAME PUFFSTATIC
             OUTPUT_NAME puff${zlib_puff_static_suffix})
 
-    if(ZLIB_PUFF_BUILD_TESTING)
+    if(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
         enable_testing()
 
         add_executable(zlib_puff_testStatic pufftest.c puff.h)
@@ -159,7 +159,7 @@ if(ZLIB_PUFF_BUILD_STATIC)
                     ${GCOV_EXECUTABLE}
                     ${llvm_option})
         endif(GCOV_EXECUTABLE)
-    endif(ZLIB_PUFF_BUILD_TESTING)
+    endif(ZLIB_PUFF_BUILD_TESTING AND NOT WIN32)
 endif(ZLIB_PUFF_BUILD_STATIC)
 
 if(ZLIB_PUFF_INSTALL)
@@ -168,7 +168,8 @@ if(ZLIB_PUFF_INSTALL)
             TARGETS zlib_puff_puff
             COMPONENT Runtime
             EXPORT puffSharedExport
-            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+            ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
         install(
             EXPORT puffSharedExport
             FILE puff-shared.cmake
diff --git a/contrib/puff/test/CMakeLists.txt b/contrib/puff/test/CMakeLists.txt
index 1ed39de0..2548d571 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -1,8 +1,8 @@
 # if we are built from with zlib, use this path's)
-if(DEFINED ZLIB_BUILD_SHARED)
+if(DEFINED ZLIB_BUILD_PUFF)
     set(WORK_DIR ${zlib_BINARY_DIR})
-    set(inst_setup zlib_puff_install)
-else(DEFINED ZLIB_BUILD_SHARED)
+    set(inst_setup zlib_install)
+else(DEFINED ZLIB_BUILD_PUFF)
     set(WORK_DIR ${puff_BINARY_DIR})
     set(inst_setup zlib_puff_install)
     set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
@@ -16,7 +16,7 @@ else(DEFINED ZLIB_BUILD_SHARED)
     set_tests_properties(zlib_puff_install
         PROPERTIES
             FIXTURES_SETUP zlib_puff_install)
-endif(DEFINED ZLIB_BUILD_SHARED)
+endif(DEFINED ZLIB_BUILD_PUFF)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
diff --git a/contrib/puff/tester.cmake b/contrib/puff/tester.cmake
index d29dc5c3..be3b81fd 100644
--- a/contrib/puff/tester.cmake
+++ b/contrib/puff/tester.cmake
@@ -8,7 +8,8 @@ cmake_minimum_required(VERSION 3.12...3.31)
 
 execute_process(COMMAND ${CMAKE_ARGV3}
                 INPUT_FILE "${CMAKE_ARGV4}/zeros.raw"
-                RESULT_VARIABLE RESULT)
+                RESULT_VARIABLE RESULT
+            COMMAND_ECHO STDERR)
 
 if(RESULT)
     message(FATAL_ERROR "Command exitited with: ${RESULT}")