libspng: Update to 0.7.4 and clean up CMake
This commit is contained in:
parent
62a926a0f5
commit
87eb1aff16
|
@ -35,7 +35,6 @@
|
|||
[submodule "Externals/libspng/libspng"]
|
||||
path = Externals/libspng/libspng
|
||||
url = https://github.com/randy408/libspng.git
|
||||
branch = v0.7.2
|
||||
shallow = true
|
||||
[submodule "Externals/VulkanMemoryAllocator"]
|
||||
path = Externals/VulkanMemoryAllocator
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
cmake_minimum_required(VERSION 3.0)
|
||||
option(SPNG_SHARED "Build shared lib" OFF)
|
||||
option(SPNG_STATIC "Build static lib" ON)
|
||||
option(BUILD_EXAMPLES "Build examples" OFF)
|
||||
|
||||
project(spng C)
|
||||
set(_PREV_CMAKE_SKIP_INSTALL_RULES "${CMAKE_SKIP_INSTALL_RULES}")
|
||||
set(CMAKE_SKIP_INSTALL_RULES TRUE)
|
||||
|
||||
add_library(spng STATIC libspng/spng/spng.c)
|
||||
target_compile_definitions(spng PUBLIC SPNG_STATIC)
|
||||
target_link_libraries(spng PUBLIC ZLIB::ZLIB)
|
||||
target_include_directories(spng PUBLIC libspng/spng)
|
||||
dolphin_disable_warnings(spng)
|
||||
add_library(spng::spng ALIAS spng)
|
||||
add_subdirectory(libspng)
|
||||
|
||||
set(CMAKE_SKIP_INSTALL_RULES "${_PREV_CMAKE_SKIP_INSTALL_RULES}")
|
||||
|
||||
add_library(spng::spng ALIAS spng_static)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9
|
||||
Subproject commit fb768002d4288590083a476af628e51c3f1d47cd
|
Loading…
Reference in New Issue