From ca18c5b1b5004ffa88b6b3b85cd038d1217c09c6 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Mar 2024 22:57:02 +0100 Subject: zlib sources removed from this tree This, for whatever reason, breaks std::fs exception handling. All remaining external projects will be moved to use this approach soon. This is to prepare it for more new libraries which would otherwise make the tree grow even further. --- contrib/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'contrib/CMakeLists.txt') diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 3939f0c..b8c25bf 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1,9 +1,14 @@ +include(FetchContent) +include(MakeAvailable) +add_subdirectory(zlib) +make_available(zlib) add_subdirectory(libpng) add_subdirectory(ogg) add_subdirectory(Opcode) add_subdirectory(sha1) add_subdirectory(vorbis) -add_subdirectory(zlib) +get_target_property(LIBB_INCLUDES Zlib::zlib INCLUDE_DIRECTORIES) +message(STATUS "Zlib includes: ${LIBB_INCLUDES}") install( TARGETS png15 Opcode zlib RUNTIME -- cgit v1.1 From dad0e8562c8e5994fcf2ebedac5a7ec920297d1f Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 3 Mar 2024 02:21:46 +0100 Subject: libpng sources removed from this tree --- contrib/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'contrib/CMakeLists.txt') diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index b8c25bf..138dc01 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1,14 +1,16 @@ +include(ApplyPatch) include(FetchContent) include(MakeAvailable) -add_subdirectory(zlib) -make_available(zlib) add_subdirectory(libpng) +add_subdirectory(zlib) +make_available(zlib libpng) +add_library(Png::png ALIAS png15) add_subdirectory(ogg) add_subdirectory(Opcode) add_subdirectory(sha1) add_subdirectory(vorbis) -get_target_property(LIBB_INCLUDES Zlib::zlib INCLUDE_DIRECTORIES) -message(STATUS "Zlib includes: ${LIBB_INCLUDES}") +get_target_property(LIBB_INCLUDES Png::png INCLUDE_DIRECTORIES) +message(STATUS "PNG includes: ${LIBB_INCLUDES}") install( TARGETS png15 Opcode zlib RUNTIME -- cgit v1.1 From 8e94244f86e657e4113e35438e59cf5771882b25 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 3 Mar 2024 12:51:03 +0100 Subject: libogg and libvorbis are no longer part of this source tree --- contrib/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'contrib/CMakeLists.txt') diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 138dc01..520ca73 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -2,15 +2,12 @@ include(ApplyPatch) include(FetchContent) include(MakeAvailable) add_subdirectory(libpng) -add_subdirectory(zlib) -make_available(zlib libpng) -add_library(Png::png ALIAS png15) add_subdirectory(ogg) +add_subdirectory(vorbis) +add_subdirectory(zlib) +make_available(libpng ogg vorbis zlib) add_subdirectory(Opcode) add_subdirectory(sha1) -add_subdirectory(vorbis) -get_target_property(LIBB_INCLUDES Png::png INCLUDE_DIRECTORIES) -message(STATUS "PNG includes: ${LIBB_INCLUDES}") install( TARGETS png15 Opcode zlib RUNTIME -- cgit v1.1