diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-05-15 02:09:54 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-05-15 02:09:54 +0200 |
| commit | 9c8ab8bd2e374a0b84531d8d76a2f2f2d8f4d31c (patch) | |
| tree | 2b1a71433bf00c477026465192cfc322745d8a2b | |
| parent | 595f0e1b2b424e040187a83573fc263ad9867f4f (diff) | |
Revert LICENSE filename
| -rw-r--r-- | cmake/OpenJPEGCPack.cmake | 4 | ||||
| -rwxr-xr-x | tools/travis-ci/run.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/OpenJPEGCPack.cmake b/cmake/OpenJPEGCPack.cmake index ff2bf48a..a6e9a866 100644 --- a/cmake/OpenJPEGCPack.cmake +++ b/cmake/OpenJPEGCPack.cmake @@ -18,8 +18,8 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY ) # For PackageMaker on MacOSX it is important to have a file extension: - set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE") - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE") + set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt") + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt") set(CPACK_PACKAGE_VERSION_MAJOR "${OPENJPEG_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${OPENJPEG_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${OPENJPEG_VERSION_BUILD}") diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index fbaf7ce8..65662709 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -277,7 +277,7 @@ echo "TRAVIS_TAG: ${TRAVIS_TAG:-}" echo "APPVEYOR_REPO_TAG: ${APPVEYOR_REPO_TAG:-}" echo "APPVEYOR_REPO_TAG_NAME: ${APPVEYOR_REPO_TAG_NAME:-}" if [ "${OPJ_CI_DEPLOY:-}" == "1" ]; then - cpack --config ${OPJ_SOURCE_DIR}/cmake/OpenJPEGCPack.cmake -V -G ZIP -P "OpenJPEG-${TRAVIS_TAG}-${OPJ_BUILDNAME_TEST}.zip" + cpack --config ${OPJ_SOURCE_DIR}/cmake/OpenJPEGCPack.cmake -V -G ZIP -P "OpenJPEG-${TRAVIS_TAG:-}-${OPJ_BUILDNAME_TEST}.zip" if [ "${TRAVIS_TAG:-}" != "" ]; then #cpack --config ${OPJ_SOURCE_DIR}/cmake/OpenJPEGCPack.cmake -V -G ZIP -P "OpenJPEG-${TRAVIS_TAG}-${OPJ_BUILDNAME_TEST}.zip" fi |