diff --git a/.gitea/workflows/source-release.yml b/.gitea/workflows/source-release.yml index f218fcb..2cd48ef 100644 --- a/.gitea/workflows/source-release.yml +++ b/.gitea/workflows/source-release.yml @@ -33,10 +33,10 @@ jobs: libcrypt-dev - name: Configure - run: cmake -S . -B build + run: cmake -S . -B /tmp/mars-nwe-build - name: Build source package - run: cmake --build build --target package_source + run: cmake --build /tmp/mars-nwe-build --target package_source - name: Find source tarball id: pkg diff --git a/CMakeLists.txt b/CMakeLists.txt index 27458ff..25bd94d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") ) set(MARS_NWE_VERSION - "${MARS_NWE_VERSION_BASE}-dev.${GIT_COMMIT_COUNT}+g${GIT_SHORT_SHA}") + "${MARS_NWE_VERSION_BASE}-dev.${GIT_COMMIT_COUNT}-g${GIT_SHORT_SHA}") if(NOT GIT_DIRTY_RESULT EQUAL 0) string(APPEND MARS_NWE_VERSION "-dirty") @@ -153,6 +153,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "pl${VERSION_PATCH}") set(CPACK_SOURCE_GENERATOR "TBZ2") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "mars_nwe-${MARS_NWE_VERSION}") -SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o") +SET(CPACK_SOURCE_IGNORE_FILES "/build/" "/_build/" CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${MARS_NWE_VERSION}") include(CPack)