From f65cbd888886f2dd39fe03117b45a4f51b28c32c Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Fri, 11 Aug 2023 14:59:31 +0200
Subject: [PATCH] Fixes:

- support verbose build (only on Ninja currently)
- fix png -> zlib dependency markup
- pass build type compiler flags to package builds (to implement full asan)
---
 cmake/modules/AddCMakeProject.cmake | 13 +++++++++++--
 deps/+PNG/PNG.cmake                 |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/AddCMakeProject.cmake b/cmake/modules/AddCMakeProject.cmake
index 5f0033d54e..d2f12237bd 100644
--- a/cmake/modules/AddCMakeProject.cmake
+++ b/cmake/modules/AddCMakeProject.cmake
@@ -3,6 +3,7 @@ include(ProcessorCount)
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
 set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path for downloaded source packages.")
+option(DEP_BUILD_VERBOSE "Use verbose output for each dependency build" OFF)
 
 get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
@@ -32,14 +33,20 @@ function(add_cmake_project projectname)
 
     set(_build_j "-j${_pcount}")
     if (CMAKE_GENERATOR MATCHES "Visual Studio")
-        set(_build_j "/m:${_pcount}")
+        set(_build_j "-m:${_pcount}")
     endif ()
 
+    string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type_upper)
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
     if (_is_multi)
         set(_configs_line "")
     endif ()
 
+    set(_verbose_switch "")
+    if (CMAKE_GENERATOR MATCHES "Ninja")
+        set(_verbose_switch "--verbose")
+    endif ()
+
     ExternalProject_Add(
         dep_${projectname}
         EXCLUDE_FROM_ALL    ON  # Not built by default, dep_${projectname} needs to be added to ALL target
@@ -52,13 +59,15 @@ function(add_cmake_project projectname)
             -DCMAKE_DEBUG_POSTFIX:STRING=d
             -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
             -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
+            -DCMAKE_CXX_FLAGS_${_build_type_upper}:STRING=${CMAKE_CXX_FLAGS_${_build_type_upper}}
+            -DCMAKE_C_FLAGS_${_build_type_upper}:STRING=${CMAKE_C_FLAGS_${_build_type_upper}}
             -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
             -DBUILD_SHARED_LIBS:BOOL=OFF
             "${_configs_line}"
             ${DEP_CMAKE_OPTS}
             ${P_ARGS_CMAKE_ARGS}
        ${P_ARGS_UNPARSED_ARGUMENTS}
-       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} -- ${_build_j}
+       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} -- ${_build_j} ${_verbose_switch}
        INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}
     )
 
diff --git a/deps/+PNG/PNG.cmake b/deps/+PNG/PNG.cmake
index 286222171b..38d332b12e 100644
--- a/deps/+PNG/PNG.cmake
+++ b/deps/+PNG/PNG.cmake
@@ -25,4 +25,4 @@ add_cmake_project(PNG
         ${_disable_neon_extension}
 )
 
-set(DEP_PMG_DEPENDS ZLIB)
+set(DEP_PNG_DEPENDS ZLIB)