From 61cde08a95ddbeaeda32111f4469cbfc48dc95c3 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 30 Dec 2015 13:59:56 -0800 Subject: CPack: Use COPYTING.txt as the license file. Otherwise The WiX generator complains with CPack Error: unsupported WiX License file extension '' Change-Id: I4f3aeaf1babaf814c05cc96c4d07a84bd9dbc2a5 Reviewed-on: https://code.wireshark.org/review/12955 Reviewed-by: Gerald Combs --- CPackConfig.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'CPackConfig.txt') diff --git a/CPackConfig.txt b/CPackConfig.txt index cec48646d1..6c7ff4a5b5 100644 --- a/CPackConfig.txt +++ b/CPackConfig.txt @@ -31,7 +31,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTEN set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") set(CPACK_PACKAGE_CONTACT "wireshark-users@wireshark.org") # set(CPACK_PACKAGE_EXECUTABLES "wireshark") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt") set(CPACK_STRIP_FILES true) set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") @@ -76,4 +76,3 @@ ENDIF(APPLE) #=============================================== include(CPack) - -- cgit v1.2.3