walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Move libpng submodule folder

This commit is contained in:
mayeut 2016-05-04 23:07:15 +02:00
parent 7de458c427
commit 0813a5eb65
6 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,9 +1,9 @@
[submodule "liblcms2"] [submodule "liblcms2"]
path = thirdparty/liblcms2/liblcms2 path = thirdparty/liblcms2/liblcms2
url = https://github.com/mm2/Little-CMS.git url = https://github.com/mm2/Little-CMS.git
[submodule "libpng"]
path = thirdparty/libpng/libpng
url = https://github.com/glennrp/libpng.git
[submodule "zlib"] [submodule "zlib"]
path = thirdparty/zlib path = thirdparty/zlib
url = https://github.com/madler/zlib.git url = https://github.com/madler/zlib.git
[submodule "libpng"]
path = thirdparty/libpng
url = https://github.com/glennrp/libpng.git

4
thirdparty/CMakeLists.txt vendored
View File

@ -32,11 +32,11 @@ endif(BUILD_THIRDPARTY)
if(BUILD_THIRDPARTY) if(BUILD_THIRDPARTY)
# Try to build it # Try to build it
message(STATUS "We will build PNG lib from thirdparty") message(STATUS "We will build PNG lib from thirdparty")
add_subdirectory(libpng) include_thirdparty(CMakeLists.txt.libpng)
set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE) set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
set(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE) set(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
set(PNG_LIBNAME png PARENT_SCOPE) set(PNG_LIBNAME png PARENT_SCOPE)
set(PNG_INCLUDE_DIRNAME ${CMAKE_CURRENT_BINARY_DIR}/libpng PARENT_SCOPE) set(PNG_INCLUDE_DIRNAME ${CMAKE_CURRENT_BINARY_DIR}/libpng-inc PARENT_SCOPE)
else(BUILD_THIRDPARTY) else(BUILD_THIRDPARTY)
if(ZLIB_FOUND) if(ZLIB_FOUND)
find_package(PNG) find_package(PNG)

57
thirdparty/CMakeLists.txt.libpng vendored Normal file
View File

@ -0,0 +1,57 @@
project(libpng C)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng/png.h ${CMAKE_CURRENT_BINARY_DIR}/libpng-inc/png.h COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng/pngconf.h ${CMAKE_CURRENT_BINARY_DIR}/libpng-inc/pngconf.h COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng/scripts/pnglibconf.h.prebuilt ${CMAKE_CURRENT_BINARY_DIR}/libpng-inc/pnglibconf.h)
# OUR SOURCES
set(libpng_public_hdrs
${CMAKE_CURRENT_BINARY_DIR}/libpng-inc/png.h
${CMAKE_CURRENT_BINARY_DIR}/libpng-inc/pngconf.h
${CMAKE_CURRENT_BINARY_DIR}/libpng-inc/pnglibconf.h
)
set(libpng_sources
pngdebug.h
pnginfo.h
pngpriv.h
pngstruct.h
png.c
pngerror.c
pngget.c
pngmem.c
pngpread.c
pngread.c
pngrio.c
pngrtran.c
pngrutil.c
pngset.c
pngtrans.c
pngwio.c
pngwrite.c
pngwtran.c
pngwutil.c
)
foreach(SRCFILE IN LISTS libpng_sources)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng/${SRCFILE} ${CMAKE_CURRENT_BINARY_DIR}/libpng-src/${SRCFILE} COPYONLY)
set(PNG_SOURCES ${PNG_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libpng-src/${SRCFILE})
endforeach()
#
set(LIBTARGET "png")
#
add_library(${LIBTARGET} STATIC ${PNG_SOURCES} ${libpng_public_hdrs})
#
if(MSVC)
set_target_properties(${LIBTARGET} PROPERTIES PREFIX "lib")
endif(MSVC)
#
target_link_libraries(${LIBTARGET} ${Z_LIBNAME} ${M_LIBRARY})
#
set_target_properties(${LIBTARGET}
PROPERTIES
OUTPUT_NAME "${LIBTARGET}"
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty/lib)
#
get_property(PNG_TARGET_INC TARGET ${LIBTARGET} PROPERTY INCLUDE_DIRECTORIES)
set_property(TARGET ${LIBTARGET} PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/libpng-inc;${CMAKE_CURRENT_SOURCE_DIR}/libpng;${CMAKE_CURRENT_BINARY_DIR}/zlib-inc;${PNG_TARGET_INC})

6
thirdparty/CMakeLists.txt.zlib vendored
View File

@ -111,12 +111,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein
${CMAKE_CURRENT_BINARY_DIR}/zlib-inc/zconf.h @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/zlib-inc/zconf.h @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.h configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.h
${CMAKE_CURRENT_BINARY_DIR}/zlib-inc/zlib.h COPYONLY) ${CMAKE_CURRENT_BINARY_DIR}/zlib-inc/zlib.h COPYONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/zlib-inc ${CMAKE_CURRENT_BINARY_DIR}/zlib-src)
#============================================================================ #============================================================================
# zlib # zlib
#============================================================================ #============================================================================
add_library(zlibstatic STATIC ${ZLIB_SOURCES} ${ZLIB_PUBLIC_HDRS}) add_library(zlibstatic STATIC ${ZLIB_SOURCES} ${ZLIB_PUBLIC_HDRS})
get_property(ZLIB_TARGET_INC TARGET zlibstatic PROPERTY INCLUDE_DIRECTORIES)
set_property(TARGET zlibstatic PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/zlib-inc;${CMAKE_CURRENT_BINARY_DIR}/zlib-src;${ZLIB_TARGET_INC})

0
thirdparty/libpng/libpng → thirdparty/libpng vendored
View File

30
thirdparty/libpng/CMakeLists.txt vendored
View File

@ -1,30 +0,0 @@
project(libpng C)
file(INSTALL ${CMAKE_CURRENT_SOURCE_DIR}/libpng/png.h ${CMAKE_CURRENT_SOURCE_DIR}/libpng/pngconf.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng/scripts/pnglibconf.h.prebuilt ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}/libpng"
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../libz
)
file(GLOB SRCS libpng/*.c)
file(GLOB HDRS libpng/*.h)
#
set(LIBTARGET "png")
#
add_library(${LIBTARGET} STATIC ${SRCS} ${HDRS})
#
if(MSVC)
set_target_properties(${LIBTARGET} PROPERTIES PREFIX "lib")
endif(MSVC)
#
target_link_libraries(${LIBTARGET} ${Z_LIBNAME} ${M_LIBRARY})
#
set_target_properties(${LIBTARGET}
PROPERTIES
OUTPUT_NAME "${LIBTARGET}"
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty/lib)
#