diff options
| author | Nathan Dorfman <ndorf@rtfm.net> | 2019-10-23 14:54:00 -0600 |
|---|---|---|
| committer | Nathan Dorfman <ndorf@rtfm.net> | 2019-10-23 16:43:30 -0600 |
| commit | 56895ee07a76366e2e9e003c8b5f14358415828e (patch) | |
| tree | 4f24bc98c5b58efcbaeda6027fc1c2c9d2c81bb6 /cmake/Version.cmake | |
| parent | Merge pull request #5973 (diff) | |
| download | monero-56895ee07a76366e2e9e003c8b5f14358415828e.tar.xz | |
cmake: Fix generation of version.cpp
Diffstat (limited to '')
| -rw-r--r-- | cmake/Version.cmake | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 632c1431c..26c2e2a1d 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -26,27 +26,25 @@ # 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}") +function (write_version tag) + set(VERSIONTAG "${tag}" CACHE STRING "The tag portion of the Monero software version" FORCE) configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") endfunction () find_package(Git QUIET) if ("$Format:$" STREQUAL "") # We're in a tarball; use hard-coded variables. - write_static_version_header("release") + set(VERSION_IS_RELEASE "true") + write_version("release") elseif (GIT_FOUND OR Git_FOUND) message(STATUS "Found Git: ${GIT_EXECUTABLE}") - add_custom_command( - OUTPUT "${CMAKE_BINARY_DIR}/version.cpp" - COMMAND "${CMAKE_COMMAND}" - "-D" "GIT=${GIT_EXECUTABLE}" - "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp" - "-P" "cmake/GenVersion.cmake" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") + include(GitVersion) + get_version_tag_from_git("${GIT_EXECUTABLE}") + write_version("${VERSIONTAG}") else() message(STATUS "WARNING: Git was not found!") - write_static_version_header("unknown") + set(VERSION_IS_RELEASE "false") + write_version("unknown") endif () add_custom_target(genversion ALL DEPENDS "${CMAKE_BINARY_DIR}/version.cpp") |