projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2384197
)
build: Only try to read the VERSION file if it exists
author
Daniel Elstner
<daniel.kitta@gmail.com>
Sat, 25 Jul 2015 20:31:05 +0000
(22:31 +0200)
committer
Daniel Elstner
<daniel.kitta@gmail.com>
Sat, 25 Jul 2015 20:31:05 +0000
(22:31 +0200)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 8b5214435e1866f92e37295b11a7b888d99818bc..800ffe27fec0aea78c3d4cd20b9f9bae4d1be06c 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-126,7
+126,7
@@
set(PV_VERSION_STRING "0.3.0")
include(GetGitRevisionDescription)
git_describe(PV_TAG_VERSION_STRING --tags --dirty)
-if(NOT PV_TAG_VERSION_STRING)
+if(NOT PV_TAG_VERSION_STRING
AND EXISTS "${PROJECT_SOURCE_DIR}/VERSION"
)
# Read the version from a file that is distributed with
# the source package (see writepackageversion.cmake).
file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PV_TAG_VERSION_STRING LIMIT_COUNT 1)