Revert LICENSE filename
This commit is contained in:
parent
595f0e1b2b
commit
9c8ab8bd2e
|
@ -18,8 +18,8 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY
|
"${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY
|
||||||
)
|
)
|
||||||
# For PackageMaker on MacOSX it is important to have a file extension:
|
# For PackageMaker on MacOSX it is important to have a file extension:
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_FILE "${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")
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
|
||||||
set(CPACK_PACKAGE_VERSION_MAJOR "${OPENJPEG_VERSION_MAJOR}")
|
set(CPACK_PACKAGE_VERSION_MAJOR "${OPENJPEG_VERSION_MAJOR}")
|
||||||
set(CPACK_PACKAGE_VERSION_MINOR "${OPENJPEG_VERSION_MINOR}")
|
set(CPACK_PACKAGE_VERSION_MINOR "${OPENJPEG_VERSION_MINOR}")
|
||||||
set(CPACK_PACKAGE_VERSION_PATCH "${OPENJPEG_VERSION_BUILD}")
|
set(CPACK_PACKAGE_VERSION_PATCH "${OPENJPEG_VERSION_BUILD}")
|
||||||
|
|
|
@ -277,7 +277,7 @@ echo "TRAVIS_TAG: ${TRAVIS_TAG:-}"
|
||||||
echo "APPVEYOR_REPO_TAG: ${APPVEYOR_REPO_TAG:-}"
|
echo "APPVEYOR_REPO_TAG: ${APPVEYOR_REPO_TAG:-}"
|
||||||
echo "APPVEYOR_REPO_TAG_NAME: ${APPVEYOR_REPO_TAG_NAME:-}"
|
echo "APPVEYOR_REPO_TAG_NAME: ${APPVEYOR_REPO_TAG_NAME:-}"
|
||||||
if [ "${OPJ_CI_DEPLOY:-}" == "1" ]; then
|
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
|
if [ "${TRAVIS_TAG:-}" != "" ]; 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"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue