aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2020-07-10 13:37:04 +0000
committerxiphon <xiphon@protonmail.com>2020-07-15 03:45:03 +0000
commit36262f029accbf486d2c8dad5c2115a3c40615b4 (patch)
tree7cd12f98a45dda2b79aaa3b3ab2dbd902613ac32 /cmake
parentc137a6ea36040aee20366933935805eff67ae3f8 (diff)
downloadmonzero-gui-36262f029accbf486d2c8dad5c2115a3c40615b4.tar.gz
monzero-gui-36262f029accbf486d2c8dad5c2115a3c40615b4.tar.xz
monzero-gui-36262f029accbf486d2c8dad5c2115a3c40615b4.zip
version: use MONERO_VERSION_FULL const as monero core version
Diffstat (limited to 'cmake')
-rw-r--r--cmake/VersionGui.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake
index fd0eddae..960c3f4e 100644
--- a/cmake/VersionGui.cmake
+++ b/cmake/VersionGui.cmake
@@ -26,24 +26,24 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-function (write_static_version_header VERSION_TAG_GUI VERSION_TAG_CORE)
+function (write_static_version_header VERSION_TAG_GUI)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js")
endfunction ()
find_package(Git QUIET)
if ("$Format:$" STREQUAL "")
# We're in a tarball; use hard-coded variables.
- write_static_version_header("release" "release")
+ write_static_version_header("release")
elseif (GIT_FOUND OR Git_FOUND)
message(STATUS "Found Git: ${GIT_EXECUTABLE}")
include(GitGetVersionTag)
git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI)
- git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/monero VERSION_TAG_CORE)
- write_static_version_header(${VERSION_TAG_GUI} ${VERSION_TAG_CORE})
+ STRING(REGEX REPLACE "^v([0-9])" "\\1" VERSION_TAG_GUI ${VERSION_TAG_GUI})
+ write_static_version_header(${VERSION_TAG_GUI})
else()
message(STATUS "WARNING: Git was not found!")
- write_static_version_header("unknown" "unknown")
+ write_static_version_header("unknown")
endif ()
add_custom_target(genversiongui ALL
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js")