HPCC-9902 Use the build version as the ecl version reported by eclcc

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

build-config.h.cmake

@@ -82,6 +82,18 @@
     #cmakedefine BUILD_TAG "${BUILD_TAG}"
 #endif
 
+#ifndef BUILD_VERSION_MAJOR
+    #define BUILD_VERSION_MAJOR ${HPCC_MAJOR}
+#endif
+
+#ifndef BUILD_VERSION_MINOR
+    #define BUILD_VERSION_MINOR ${HPCC_MINOR}
+#endif
+
+#ifndef BUILD_VERSION_POINT
+    #define BUILD_VERSION_POINT ${HPCC_POINT}
+#endif
+
 #ifndef BASE_BUILD_TAG
     #cmakedefine BASE_BUILD_TAG "${BASE_BUILD_TAG}"
 #endif

common/fileview2/CMakeLists.txt

@@ -60,6 +60,7 @@ set (    SRCS
     )
 
 include_directories ( 
+         ${CMAKE_BINARY_DIR}/oss
          ./../../system/mp 
          ./../../system/jhtree 
          ./../dllserver 

ecl/hql/hql.hpp

@@ -27,6 +27,7 @@
 #define HQL_API
 #endif
 #include "hqlatoms.hpp"
+#include "build-config.h"
 
 #define stringify(x) # x
 #define estringify(x) stringify(x)
@@ -47,9 +48,9 @@ Relevant changes include
 
 */
 
-#define LANGUAGE_VERSION_MAJOR      4
-#define LANGUAGE_VERSION_MINOR      0
-#define LANGUAGE_VERSION_SUB        0
+#define LANGUAGE_VERSION_MAJOR      BUILD_VERSION_MAJOR
+#define LANGUAGE_VERSION_MINOR      BUILD_VERSION_MINOR
+#define LANGUAGE_VERSION_SUB        BUILD_VERSION_POINT
 
 #define LANGUAGE_VERSION   estringify(LANGUAGE_VERSION_MAJOR) "." estringify(LANGUAGE_VERSION_MINOR) "." estringify(LANGUAGE_VERSION_SUB)
 

esp/services/ws_dfu/CMakeLists.txt

@@ -39,6 +39,7 @@ set (    SRCS
     )
 
 include_directories ( 
+         ${CMAKE_BINARY_DIR}/oss
          ./../../../dali/dfu 
          ./../../../system/mp 
          ./../../platform 

esp/services/ws_workunits/CMakeLists.txt

@@ -44,6 +44,7 @@ set (    SRCS
     )
 
 include_directories (
+         ${CMAKE_BINARY_DIR}/oss
          ./../../esplib
          ./../../../system/mp
          ./../../platform