Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
zlib package: some minor cleaning up.
  • Loading branch information
agarny committed May 19, 2017
1 parent afc70bd commit 482e89e
Showing 1 changed file with 34 additions and 48 deletions.
82 changes: 34 additions & 48 deletions src/plugins/thirdParty/zlib/CMakeLists.txt 100755 → 100644
@@ -1,17 +1,18 @@
PROJECT(zlibPlugin)

# Version of our package
# Name and version of our package

SET(PACKAGE_VERSION "1.2.11")
SET(PACKAGE_NAME zlib)
SET(PACKAGE_VERSION 1.2.11)

# Version of our library

SET(MAJOR_LIBRARY_VERSION "1")
SET(LIBRARY_VERSION "${MAJOR_LIBRARY_VERSION}.2.11")
SET(MAJOR_LIBRARY_VERSION 1)
SET(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.2.11)

# Git tag for our library

SET(GIT_TAG "v1.2.11")
SET(GIT_TAG v1.2.11)

# Specify where our local package will be installed

Expand All @@ -27,11 +28,8 @@ IF(WIN32)
SET(SHARED_LIBRARY zlibd${CMAKE_SHARED_LIBRARY_SUFFIX})
SET(IMPORT_LIBRARY zlibd${CMAKE_IMPORT_LIBRARY_SUFFIX})
ENDIF()
ELSEIF(APPLE)
SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z.${MAJOR_LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
SET(IMPORT_LIBRARY ${SHARED_LIBRARY})
ELSE()
SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJOR_LIBRARY_VERSION})
SET(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX_PRE}.${MAJOR_LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX_POST})
SET(IMPORT_LIBRARY ${SHARED_LIBRARY})
ENDIF()

Expand Down Expand Up @@ -65,32 +63,28 @@ IF(USE_PREBUILT_ZLIB_PACKAGE)

IF(WIN32)
IF(RELEASE_MODE)
RETRIEVE_PACKAGE_FILE(zlib ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 46f64af9fea228a3afa6d64bad1a0700ba20c67b
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 6a8408008702971d5cbf5e6f49953273d6e2f249
63892d9f0e54248c4c6f97ca0ba5342938b52d0e
)
RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 46f64af9fea228a3afa6d64bad1a0700ba20c67b
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 6a8408008702971d5cbf5e6f49953273d6e2f249
63892d9f0e54248c4c6f97ca0ba5342938b52d0e)
ELSE()
RETRIEVE_PACKAGE_FILE(zlib ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} b3695becf1f964b1207dc2371aa1978973d92459
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 2121f4b71cab6e851b2a01ac241a684a75ee06ad
0ef60637c15c35954fe4ca17be1837cd72bd8f69
)
RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} b3695becf1f964b1207dc2371aa1978973d92459
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 2121f4b71cab6e851b2a01ac241a684a75ee06ad
0ef60637c15c35954fe4ca17be1837cd72bd8f69)
ENDIF()
ELSEIF(APPLE)
RETRIEVE_PACKAGE_FILE(zlib ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 4de712a64a9121424aaf23a9683165c6af349098
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 2da040b5883c4a00166e9a22cc49c5400d09d025
)
RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 4de712a64a9121424aaf23a9683165c6af349098
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 2da040b5883c4a00166e9a22cc49c5400d09d025)
ELSE()
RETRIEVE_PACKAGE_FILE(zlib ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} f9934d635b4713cdceab4aa751745029fab4f82d
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES e7a94eaf5cd6bfa099ffc700ea81f26e3030a065
)
RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} f9934d635b4713cdceab4aa751745029fab4f82d
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES e7a94eaf5cd6bfa099ffc700ea81f26e3030a065)
ENDIF()
ELSE()
# Rely on the ExternalProject module to build our package
Expand All @@ -105,19 +99,17 @@ ELSE()

# Build zlib as an external project

SET(PACKAGE_BUILD zlibBuild)
SET(PACKAGE_BUILD ${PACKAGE_NAME}Build)

ExternalProject_Add(${PACKAGE_BUILD}
SOURCE_DIR
${PROJECT_SOURCE_DIR}/ext/proj
INSTALL_DIR
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}
GIT_REPOSITORY
https://github.com/opencor/zlib.git
https://github.com/opencor/zlib
GIT_TAG
${GIT_TAG}
PATCH_COMMAND
${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
CMAKE_CACHE_ARGS
-DCMAKE_C_FLAGS:STRING=${PACKAGE_C_FLAGS}
CMAKE_ARGS
Expand All @@ -141,23 +133,17 @@ ELSE()
# Dereference the symbolic link to the library since CMake's tar can't
# do this

SET(FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${SHARED_LIBRARY})

IF(APPLE)
SET(REAL_FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z.${LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
ELSE()
SET(REAL_FULL_SHARED_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIBRARY_VERSION})
ENDIF()

ExternalProject_Add_Step(${PACKAGE_BUILD} CopyLibrary
COMMAND ${CMAKE_COMMAND} -E remove -f ${FULL_SHARED_LIBRARY}
COMMAND ${CMAKE_COMMAND} -E copy ${REAL_FULL_SHARED_LIBRARY} ${FULL_SHARED_LIBRARY}
COMMAND ${CMAKE_COMMAND} -E remove -f ${SHARED_LIBRARY}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX_PRE}.${LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX_POST}
${SHARED_LIBRARY}
WORKING_DIRECTORY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib
DEPENDEES install)
ENDIF()

# Package our external project

CREATE_PACKAGE_FILE(zlib ${PACKAGE_VERSION}
CREATE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
${LOCAL_EXTERNAL_PACKAGE_DIR}
PACKAGED_FILES include ${SHA1_FILES}
SHA1_FILES ${SHA1_FILES}
Expand All @@ -174,9 +160,9 @@ SET(ZLIB_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${IMPORT_LIBRARY} PARENT

# Add the plugin

SET(ZLIB_PLUGIN zlib PARENT_SCOPE)
SET(ZLIB_PLUGIN ${PACKAGE_NAME} PARENT_SCOPE)

ADD_PLUGIN(zlib
ADD_PLUGIN(${PACKAGE_NAME}
SOURCES
../../plugininfo.cpp

Expand Down

0 comments on commit 482e89e

Please sign in to comment.