diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-01-06 20:29:33 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-01-06 20:29:33 +0100 |
| commit | 313716afe8bdad772dbfb80108103a8ad3402402 (patch) | |
| tree | f09a73ab01229fba759c635f9d6082a172913bfc /cmake | |
| parent | 82f3d7373234cc0db79a22d476cb54b5eda7a0ea (diff) | |
| parent | 1baa26f8c13462ebc424605420d8e60a1977e3a8 (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
cmake: don't upload tarball for branch builds
cmake: append branch information for branch builds
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-tarball.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/opentrack-tarball.cmake b/cmake/opentrack-tarball.cmake index 6b40081b..f26052f3 100644 --- a/cmake/opentrack-tarball.cmake +++ b/cmake/opentrack-tarball.cmake @@ -11,6 +11,9 @@ set(filename_1) if (NOT OPENTRACK_TAG_EXACT STREQUAL OPENTRACK_COMMIT) string(TIMESTAMP filename_1 "-%Y%m%d%H%M%S") endif() +if (NOT filename-branch STREQUAL "unstable") + string(CONCAT filename_0 ${filename_0} "-" ${filename-branch}) +endif() set(filename "${CMAKE_BINARY_DIR}/${filename_0}${filename_1}.zip") add_custom_target(tarball-real) |