Merge pull request #449 from MikaelSmith/fixup

(packaging) Switch to using project version
puppetlabs · Jul 10, 2016 · ae52a88 · ae52a88
2 parents aff8caf + 610bfa0
commit ae52a88
Show file tree

Hide file tree

Showing 4 changed files with 296 additions and 308 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(pxp-agent)
+project(pxp-agent VERSION 1.1.4)
 
 if (NOT CMAKE_BUILD_TYPE)
     message(STATUS "Defaulting to a release build.")
@@ -26,8 +26,7 @@ set(VENDOR_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor)
 list(APPEND CMAKE_MODULE_PATH ${VENDOR_DIRECTORY})
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-# set a version macro and expand related template
-set(APPLICATION_VERSION_STRING "1.1.4")
+# expand template based on PROJECT_VERSION
 configure_file(templates/version-inl.hpp ${CMAKE_BINARY_DIR}/generated/version-inl.hpp)
 
 # Set the root path macro and expand related template

diff --git a/exe/CMakeLists.txt b/exe/CMakeLists.txt
@@ -12,6 +12,7 @@ include_directories(
 )
 
 add_executable(pxp-agent ${PXP-AGENT_SOURCES})
+set_target_properties(pxp-agent PROPERTIES VERSION ${PROJECT_VERSION})
 target_link_libraries(pxp-agent ${CPP_PCP_CLIENT_LIB} libpxp-agent)
 
 install(TARGETS pxp-agent DESTINATION bin)