Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

DEV-20 Adding version tagging to release. Create OSX package. Make re… #30

Merged
merged 5 commits into from May 15, 2018

Conversation

amastracci
Copy link
Contributor

…lease branch master and set 0.1.x release version

…lease branch master and set 0.1.x release version

#pragma once

#define SWARM_VERSION "@PROJECT_VERSION@"
Copy link
Contributor

@ebruck ebruck May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this version string replacing the one in include/bluzelle.hpp.
The daemon has a --version option.

CMakeLists.txt Outdated
include(swarm_version.cmake)
configure_file(${PROJECT_SOURCE_DIR}/swarm_version.hpp.in ${CMAKE_BINARY_DIR}/swarm_version.hpp)
message("Build version ${PROJECT_VERSION}")

Copy link
Contributor

@ebruck ebruck May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to configure the file into a temp like so:

configure_file(${PROJECT_SOURCE_DIR}/swarm_version.hpp.in ${CMAKE_BINARY_DIR}/swarm_version.hpp.tmp)

then:

execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/swarm_version.hpp.tmp ${CMAKE_BINARY_DIR}/swarm_version.hpp)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/swarm_version.hpp.tmp)

This allows the daemon to include the header and only triggering a compile if the version changes since we need to include it for the --version option.

@amastracci amastracci merged commit d51a895 into devel May 15, 2018
@amastracci amastracci deleted the task/amastracci/DEV-20 branch May 15, 2018 22:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants