Rewrite libpng section to support both PNG::PNG and png targets

Author: AaronVanGeffen

CMakeLists.txt

@@ -103,19 +103,11 @@ if (ENABLE_DISCORD_RPC)
 endif ()
 
 if (ENABLE_LIBPNG)
-    if (NOT MSVC)
-        find_package(PNG REQUIRED)
-    endif ()
     target_compile_definitions(sawyer PRIVATE CS_ENABLE_LIBPNG)
+    find_package(PNG REQUIRED)
 
-    if (MSVC)
-        if (${VCPKG_TARGET_TRIPLET} MATCHES "-static$")
-            find_package(libpng CONFIG REQUIRED)
-            merge_static_libraries(sawyer $<TARGET_FILE:png_static>)
-        else ()
-            find_package(PNG REQUIRED)
-            target_link_libraries(sawyer PRIVATE PNG::PNG)
-        endif ()
+    if (TARGET PNG::PNG)
+        target_link_libraries(sawyer PRIVATE PNG::PNG)
     else ()
         target_link_libraries(sawyer PRIVATE png)
     endif ()

tools/fsaw/CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 project(fsaw CXX)
 
-find_package(sawyer REQUIRED PATHS ../../out/share)
-
 set(CMAKE_CXX_STANDARD 17)
 
 file(GLOB_RECURSE SAWYER_SOURCES "src/*.cpp")
@@ -13,6 +11,12 @@ else ()
 
 endif ()
 
+# libsawyer
+find_package(sawyer REQUIRED PATHS ../../out/share)
+
+# libraries
+find_package(PNG REQUIRED)
+
 add_executable(fsaw ${SAWYER_SOURCES})
 if (${VCPKG_TARGET_TRIPLET} MATCHES "-static$")
     set_property(TARGET fsaw PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

tools/gxc/CMakeLists.txt

@@ -1,15 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 project(gxc CXX)
 
-# libsawyer
-find_package(sawyer REQUIRED PATHS ../../out/share)
-
-# libraries
-if (MSVC)
-    find_package(libpng CONFIG REQUIRED)
-endif ()
-find_package(nlohmann_json CONFIG REQUIRED)
-
 set(CMAKE_CXX_STANDARD 17)
 
 file(GLOB_RECURSE SAWYER_SOURCES "src/*.cpp")
@@ -23,6 +14,13 @@ else ()
     endif()
 endif ()
 
+# libsawyer
+find_package(sawyer REQUIRED PATHS ../../out/share)
+
+# libraries
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(PNG REQUIRED)
+
 add_executable(gxc ${SAWYER_SOURCES})
 if (${VCPKG_TARGET_TRIPLET} MATCHES "-static$")
     set_property(TARGET gxc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")