ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6630 from lioncash/png 

CMakeLists: Don't dump libpng's includes into the top-level directory
This commit is contained in:
Markus Wick 2018-04-13 11:08:44 +02:00 committed by GitHub
parent bbd1bb8eaa 6a637cfc22
commit 140da8c1a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -599,7 +599,6 @@ if (PNG_FOUND)
else() else()
message(STATUS "Using static libpng from Externals") message(STATUS "Using static libpng from Externals")
add_subdirectory(Externals/libpng) add_subdirectory(Externals/libpng)
include_directories(Externals/libpng)
set(PNG png) set(PNG png)
endif() endif()

15
Externals/libpng/CMakeLists.txt vendored
View File

@ -1,5 +1,4 @@
# OUR SOURCES add_library(png STATIC
set(SRCS
png.h png.h
pngconf.h pngconf.h
png.c png.c
@ -18,7 +17,15 @@ set(SRCS
pngwtran.c pngwtran.c
pngwutil.c pngwutil.c
) )
target_include_directories(png
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
if(NOT MSVC) if(NOT MSVC)
add_definitions(-Wno-self-assign) target_compile_options(png
PRIVATE
-Wno-self-assign
)
endif() endif()
add_library(png STATIC ${SRCS})