Fix option support

Author: fmauger

CMakeLists.txt

@@ -17,12 +17,10 @@ endif()
 # - Load Custom Modules
 list(INSERT CMAKE_MODULE_PATH 0 ${PROJECT_SOURCE_DIR}/cmake)
 
+include(BxVersionManager)
+
 # - Versioning
-set(BxRabbitMQ_VERSION_MAJOR 0)
-set(BxRabbitMQ_VERSION_MINOR 3)
-set(BxRabbitMQ_VERSION_PATCH 0)
-set(BxRabbitMQ_VERSION
-  "${BxRabbitMQ_VERSION_MAJOR}.${BxRabbitMQ_VERSION_MINOR}.${BxRabbitMQ_VERSION_PATCH}")
+bx_version_set(BxRabbitMQ 0 3)
 
 #-----------------------------------------------------------------------
 # - Standard UNIX Tool install paths, including relative paths for use

cmake/BxPackageVersions.db

@@ -0,0 +1,6 @@
+# List of released versions MAJOR.MINOR.PATCH
+0.3.4
+1.0.0
+1.1.0
+1.2.0
+# end

cmake/BxVersionManager.cmake

@@ -0,0 +1,60 @@
+# CMake tools for version management
+
+function(bx_version_build_version_number prefix_)
+  set(${prefix_}_VERSION
+    "${${prefix_}_VERSION_MAJOR}.${${prefix_}_VERSION_MINOR}.${${prefix_}_VERSION_PATCH}"
+    PARENT_SCOPE)
+endfunction()
+
+function(bx_version_extract_patch_from_db major_ minor_ patch_)
+  # message(STATUS "[info] bx_version_extract_patch_from_db: Entering...")
+  # message(STATUS "[info]   - Major   = ${major_}")
+  # message(STATUS "[info]   - Minor   = ${minor_}")
+  file(STRINGS
+    ${PROJECT_SOURCE_DIR}/cmake/BxPackageVersions.db
+    _bx_package_versions_lines
+    REGEX "^([0-9]+)\\.([0-9]+)\\.([0-9+])"
+    )
+  # message(STATUS "[info]  Lines = ${_bx_package_versions_lines}")
+  foreach(line ${_bx_package_versions_lines})
+    string(REPLACE "." ";" _version_list ${line})
+    # message(STATUS "[info]  Version list = ${_version_list}")
+    list(GET _version_list 0 _version_major)
+    list(GET _version_list 1 _version_minor)
+    list(GET _version_list 2 _version_patch)
+    if(${_version_major} EQUAL ${major_})
+      if(${_version_minor} EQUAL ${minor_})
+	set(${patch_} ${_version_patch} PARENT_SCOPE)
+	# message(STATUS "[info]  Resolved patch = ${_version_patch}")
+      endif()
+    endif()
+  endforeach()
+  # message(STATUS "[info]   - New patch is set to : $ {${patch_}}")
+  # message(STATUS "[info] bx_version_extract_patch_from_db: Exiting.")
+endfunction()
+
+macro(bx_version_set prefix_ major_ minor_)
+  #message(STATUS "[info] bx_version_set: prefix_  = ${prefix_}")
+  #message(STATUS "[info] bx_version_set: major_   = ${major_}")
+  #message(STATUS "[info] bx_version_set: minor_   = ${minor_}")
+  #message(STATUS "[info] bx_version_set: key  = ${prefix_}_VERSION_MAJOR")
+  set(_version_major ${major_})
+  set(_version_minor ${minor_})
+  set(_version_patch 0)
+  set(${prefix_}_VERSION_MAJOR ${_version_major})
+  set(${prefix_}_VERSION_MINOR ${_version_minor})
+  set(${prefix_}_VERSION_PATCH ${_version_patch})
+  # message(STATUS "[info] bx_version_set: Major   = ${${prefix_}_VERSION_MAJOR}")
+  # message(STATUS "[info] bx_version_set: Minor   = ${${prefix_}_VERSION_MINOR}")
+  # message(STATUS "[info] bx_version_set: Patch   = ${${prefix_}_VERSION_PATCH}")
+  bx_version_extract_patch_from_db(
+    ${${prefix_}_VERSION_MAJOR}
+    ${${prefix_}_VERSION_MINOR}
+    ${prefix_}_VERSION_PATCH
+    )
+  bx_version_build_version_number(${prefix_})
+  message(STATUS "[info] bx_version_set: Major   = ${${prefix_}_VERSION_MAJOR}")
+  message(STATUS "[info] bx_version_set: Minor   = ${${prefix_}_VERSION_MINOR}")
+  message(STATUS "[info] bx_version_set: Patch   = ${${prefix_}_VERSION_PATCH}")
+  message(STATUS "[info] bx_version_set: Version = ${${prefix_}_VERSION}")
+endmacro()

tools/build.sh

@@ -34,7 +34,7 @@ install_dir=$(pwd)/_install.d
 build_dir=$(pwd)/_build.d
 
 devel=false
-bxjsontools_prefix=$(bxjsontools-query --cmakedir)
+bxjsontools_prefix=
 with_management=false
 
 while [ -n "$1" ]; do
@@ -51,6 +51,12 @@ while [ -n "$1" ]; do
     shift 1
 done
 
+if [ ${with_management} = true ]; then
+    if [ "x${bxjsontools_prefix}" = "x" ]; then
+	bxjsontools_prefix=$(bxjsontools-query --cmakedir)
+    fi
+fi
+
 # brewsh
 # curlpp_setup
 # rabbitmqc_setup