use project name for package file name is package name might not be s…

…et yet
zerotacg · Jul 8, 2024 · 0543d25 · 0543d25
1 parent cb9f21e
commit 0543d25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -19,7 +19,6 @@
         "WITH_STUDIO": false,
         "WITH_TOOLS": false,
         "WITH_QT5": true,
-        "CPACK_PACKAGE_NAME": "snowballs",
         "CMAKE_PREFIX_PATH": "${sourceDir}/build/install"
       }
     },