aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2014-09-15 08:13:26 +0200
committerRiccardo Spagni <ric@spagni.net>2014-09-15 08:18:11 +0200
commitd97191d4f95a9fcbf154bcaed297daabd7cf691d (patch)
tree766a2f07063a01a4fe9e842b53d47c1bc0b1ef7e
parentFreeBSD static linking fixes (diff)
downloadmonero-d97191d4f95a9fcbf154bcaed297daabd7cf691d.tar.xz
new Makefile target: release-static
-rw-r--r--Makefile4
-rw-r--r--src/version.cmake2
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 65b72d4e1..8a4e7a75e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,10 @@ test-release: build-release
all-release: build-release
+release-static:
+ mkdir -p build/release
+ cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release ../.. && $(MAKE)
+
clean:
@echo "WARNING: Back-up your wallet if it exists within ./build!" ; \
read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; \
diff --git a/src/version.cmake b/src/version.cmake
index 090ca690b..096492330 100644
--- a/src/version.cmake
+++ b/src/version.cmake
@@ -7,7 +7,7 @@ if(RET)
else()
message(STATUS "You are currently on commit ${COMMIT}")
execute_process(COMMAND "${GIT}" show-ref --tags -d --abbrev COMMAND awk "END{print $1}" RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(RET)
+ if(RET AND NOT ${TAGGEDCOMMIT} STREQUAL "")
message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
set(VERSIONTAG "${COMMIT}")
else()