From fc38c206d76385d609af4cedb574039c1f742165 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 27 Nov 2021 07:29:23 +0000 Subject: [PATCH] 3rdParty/libpng: `set(PNG_EXECUTABLES OFF)` Disables executable targets of libpng. Also, now that CMP0077 is set correctly, we can set the other options as simple variables. --- 3rdParty/libpng/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/3rdParty/libpng/CMakeLists.txt b/3rdParty/libpng/CMakeLists.txt index 8c19e2baa..05dbde8f2 100644 --- a/3rdParty/libpng/CMakeLists.txt +++ b/3rdParty/libpng/CMakeLists.txt @@ -8,14 +8,16 @@ endif() if(DEVILUTIONX_STATIC_LIBPNG) set(PNG_LIBRARY png_static) - set(PNG_STATIC ON CACHE BOOL "Build static lib" FORCE) - set(PNG_SHARED OFF CACHE BOOL "Build shared lib" FORCE) + set(PNG_STATIC ON) + set(PNG_SHARED OFF) else() set(PNG_LIBRARY png) - set(PNG_STATIC OFF CACHE BOOL "Build static lib" FORCE) - set(PNG_SHARED ON CACHE BOOL "Build shared lib" FORCE) + set(PNG_STATIC OFF) + set(PNG_SHARED ON) endif() -set(PNG_TESTS OFF CACHE BOOL "Build libpng tests") +set(PNG_TESTS OFF) +set(PNG_EXECUTABLES OFF) +set(SKIP_INSTALL_PROGRAMS ON) include(FetchContent) FetchContent_Declare(png