CMakeLists: Don't dump libpng's includes into the top-level directory

Instead, add the includes to the target, which only libraries that link it in can actually see.
This commit is contained in:
Lioncash 2018-04-11 17:30:15 -04:00
parent 0bfeb37a1f
commit 6a637cfc22
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 11 additions and 5 deletions

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()

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})