From 84de7075c3acebed9c05ec1badbc323ccc6b9443 Mon Sep 17 00:00:00 2001 From: Colin Cornaby Date: Sun, 10 Sep 2023 21:09:55 -0700 Subject: [PATCH 1/2] Fixes for finding png crush executable --- Sources/Plasma/Apps/plClient/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt index ee8ab6403d..06b2011651 100644 --- a/Sources/Plasma/Apps/plClient/CMakeLists.txt +++ b/Sources/Plasma/Apps/plClient/CMakeLists.txt @@ -29,7 +29,7 @@ cmake_dependent_option(RESOURCE_BRUTE "Allow pngcrush brute-force optimization" if(PLASMA_BUILD_RESOURCE_DAT) set(external_DAT "${CMAKE_CURRENT_BINARY_DIR}/resource.dat") if(RESOURCE_OPTIMIZE) - string(APPEND OPTIMIZE_ARGUMENT "--pngcrush \"${PNGCRUSH_EXECUTABLE}\" ") + string(APPEND OPTIMIZE_ARGUMENT "--pngcrush=\"${PNGCRUSH_EXECUTABLE}\" ") endif() if(RESOURCE_BRUTE) string(APPEND OPTIMIZE_ARGUMENT "--brute ") From 175cfafa55c0df18cd4aded94667b9ad9976f2f2 Mon Sep 17 00:00:00 2001 From: Colin Cornaby Date: Mon, 11 Sep 2023 19:11:24 -0700 Subject: [PATCH 2/2] Apply CMake pngcrush suggestions from code review Co-authored-by: Adam Johnson --- Sources/Plasma/Apps/plClient/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt index 06b2011651..e292ab8331 100644 --- a/Sources/Plasma/Apps/plClient/CMakeLists.txt +++ b/Sources/Plasma/Apps/plClient/CMakeLists.txt @@ -29,10 +29,10 @@ cmake_dependent_option(RESOURCE_BRUTE "Allow pngcrush brute-force optimization" if(PLASMA_BUILD_RESOURCE_DAT) set(external_DAT "${CMAKE_CURRENT_BINARY_DIR}/resource.dat") if(RESOURCE_OPTIMIZE) - string(APPEND OPTIMIZE_ARGUMENT "--pngcrush=\"${PNGCRUSH_EXECUTABLE}\" ") + list(APPEND OPTIMIZE_ARGUMENT --pngcrush "${PNGCRUSH_EXECUTABLE}") endif() if(RESOURCE_BRUTE) - string(APPEND OPTIMIZE_ARGUMENT "--brute ") + list(APPEND OPTIMIZE_ARGUMENT "--brute") endif() add_custom_command(