Fix cross-compiling benchmarks and libpng.

diff --git a/test/benchmarks/CMakeLists.txt b/test/benchmarks/CMakeLists.txt
index 475fe07ceeefc7dc317ad017eddc05785d532ec2..616954fc0ebf9a658ac2e52c06a244d72335e423 100644 (file)
--- a/test/benchmarks/CMakeLists.txt
+++ b/test/benchmarks/CMakeLists.txt
@@ -54,10 +54,8 @@ if(WIN32)
     target_link_libraries(benchmark_zlib shlwapi)
 endif()
 
-if(ZLIB_ENABLE_TESTS)
-    add_test(NAME benchmark_zlib
-        COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:benchmark_zlib>)
-endif()
+add_test(NAME benchmark_zlib
+    COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:benchmark_zlib>)
 
 if(WITH_BENCHMARK_APPS)
     option(BUILD_ALT_BENCH "Link against alternative zlib implementation" OFF)
@@ -72,7 +70,8 @@ if(WITH_BENCHMARK_APPS)
         FetchContent_GetProperties(PNG)
         if(NOT PNG_POPULATED)
             FetchContent_Populate(PNG)
-            add_subdirectory(${PNG_SOURCE_DIR} ${PNG_BINARY_DIR})
+            set(PNG_INCLUDE_DIR ${png_SOURCE_DIR})
+            add_subdirectory(${png_SOURCE_DIR} ${png_BINARY_DIR})
         endif()
     endif()