Commit 07c45549 authored by David Gobbi's avatar David Gobbi Committed by Kitware Robot
Browse files

Merge topic 'zlib-soversion'

d9d26ba4 Merge branch 'upstream-zlib' into zlib-soversion
1cbd9fde zlib 2015-12-14 (751703ae)
ea74dd0b

 zlib: remove zlib1.rc from the list of used files.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !1009
parents 18dbc145 d9d26ba4
Pipeline #2709 failed with stage
......@@ -40,7 +40,6 @@ zlib.h
zutil.h
zconf.h.cmakein
win32/zlib1.rc
ChangeLog
README
......
......@@ -135,6 +135,19 @@ set(ZLIB_SRCS
zutil.c
)
# XXX(kitware): create the third-party library for VTK
vtk_add_library(vtkzlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(vtkzlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
if (NOT VTK_INSTALL_NO_DEVELOPMENT)
install(FILES
${ZLIB_PUBLIC_HDRS}
DESTINATION "${INSTALL_INC_DIR}"
COMPONENT Development)
endif ()
if (FALSE) # XXX(kitware): skip all the original build/install commands
if(NOT MINGW)
set(ZLIB_DLL_SRCS
win32/zlib1.rc # If present will override custom build rule below.
......@@ -190,24 +203,15 @@ if(MINGW)
-D GCC_WINDRES
-I ${CMAKE_CURRENT_SOURCE_DIR}
-I ${CMAKE_CURRENT_BINARY_DIR}
# XXX(kitware): add the vtkzlib directories for vtkzlib.h
-I ${vtkzlib_SOURCE_DIR}
-I ${vtkzlib_BINARY_DIR}
-o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc
VERBATIM)
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif(MINGW)
if (FALSE) # XXX(kitware): build using VTK's magic.
add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
endif ()
vtk_add_library(vtkzlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(vtkzlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(vtkzlib PROPERTIES SOVERSION 1)
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(zlib PROPERTIES SOVERSION 1)
if(NOT CYGWIN)
# This property causes shared libraries on Linux to have the full version
......@@ -217,18 +221,9 @@ if(NOT CYGWIN)
#
# This has no effect with MSVC, on that platform the version info for
# the DLL comes from the resource file win32/zlib1.rc
set_target_properties(vtkzlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
endif()
if (NOT VTK_INSTALL_NO_DEVELOPMENT)
install(FILES
${ZLIB_PUBLIC_HDRS}
DESTINATION "${INSTALL_INC_DIR}"
COMPONENT Development)
endif ()
if (FALSE) # XXX(kitware): Disable upstream install and examples bits.
if(UNIX)
# On unix-like platforms the library is almost always called libz
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
......
#include <winver.h>
#include "../zlib.h"
#ifdef GCC_WINDRES
VS_VERSION_INFO VERSIONINFO
#else
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
#endif
FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS 1
#else
FILEFLAGS 0
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE 0 // not used
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "zlib data compression library\0"
VALUE "FileVersion", ZLIB_VERSION "\0"
VALUE "InternalName", "zlib1.dll\0"
VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
VALUE "OriginalFilename", "zlib1.dll\0"
VALUE "ProductName", "zlib\0"
VALUE "ProductVersion", ZLIB_VERSION "\0"
VALUE "Comments", "For more information visit http://www.zlib.net/\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 1252
END
END
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment