From 0543d250a2f4a0da3f4937c2ae79bdaa7412253e Mon Sep 17 00:00:00 2001 From: Tobias Peters Date: Mon, 8 Jul 2024 07:09:54 +0000 Subject: [PATCH] use project name for package file name is package name might not be set yet --- CMakeLists.txt | 4 ++-- cmake/CMakePresets.nel.json | 3 +-- snowballs2/CMakePresets.json | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3baab3170..deeb6f6a99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -515,8 +515,8 @@ SET(CPACK_NSIS_CONTACT "matt.raykowski@gmail.com") ## Source Packages # remove os part of file name -SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") IF(WIN32) #SET(CPACK_GENERATOR "NSIS") SET(CPACK_GENERATOR "NSIS;ZIP") diff --git a/cmake/CMakePresets.nel.json b/cmake/CMakePresets.nel.json index 3fb8471d26..7f0b49e837 100644 --- a/cmake/CMakePresets.nel.json +++ b/cmake/CMakePresets.nel.json @@ -24,8 +24,7 @@ "WITH_STUDIO": false, "WITH_TOOLS": false, "WITH_QT5": true, - "WITH_LIBGSF": true, - "CPACK_PACKAGE_NAME": "nel" + "WITH_LIBGSF": true } }, { diff --git a/snowballs2/CMakePresets.json b/snowballs2/CMakePresets.json index e48b11a462..39a7511ba1 100644 --- a/snowballs2/CMakePresets.json +++ b/snowballs2/CMakePresets.json @@ -19,7 +19,6 @@ "WITH_STUDIO": false, "WITH_TOOLS": false, "WITH_QT5": true, - "CPACK_PACKAGE_NAME": "snowballs", "CMAKE_PREFIX_PATH": "${sourceDir}/build/install" } },