diff options
Diffstat (limited to 'cmake/VersionGui.cmake')
| -rw-r--r-- | cmake/VersionGui.cmake | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake index b248cba0..fd0eddae 100644 --- a/cmake/VersionGui.cmake +++ b/cmake/VersionGui.cmake @@ -26,27 +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 hash) - set(VERSIONTAG "${hash}") - configure_file("${CMAKE_SOURCE_DIR}/version.js.in" "${CMAKE_SOURCE_DIR}/version.js") +function (write_static_version_header VERSION_TAG_GUI VERSION_TAG_CORE) + 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") + write_static_version_header("release" "release") elseif (GIT_FOUND OR Git_FOUND) message(STATUS "Found Git: ${GIT_EXECUTABLE}") - add_custom_command( - OUTPUT "${CMAKE_SOURCE_DIR}/version.js" - COMMAND "${CMAKE_COMMAND}" - "-D" "GIT=${GIT_EXECUTABLE}" - "-D" "TO=${CMAKE_SOURCE_DIR}/version.js" - "-P" "cmake/GenVersionGui.cmake" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") + + 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}) else() message(STATUS "WARNING: Git was not found!") - write_static_version_header("unknown") + write_static_version_header("unknown" "unknown") endif () add_custom_target(genversiongui ALL - DEPENDS "${CMAKE_SOURCE_DIR}/version.js") + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js") |