diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 31f6e74e5a..6d0817b0a3 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -17,6 +17,16 @@ set(OPENCV_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/OpenCV) set(SIXENSE_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/Sixense) set(UVCCAMERACONTROL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/UVCCameraControl) +if (DEFINED ENV{JOB_ID}) + set(BUILD_SEQ $ENV{JOB_ID}) +else () + set(BUILD_SEQ "0") +endif () + +message("BUILD_SEQ = ${BUILD_SEQ}") + +set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH}) + if (APPLE) set(GL_HEADERS "#include \n#include ") else (APPLE) @@ -35,6 +45,7 @@ include_glm(${TARGET_NAME} ${ROOT_DIR}) # create the InterfaceConfig.h file based on GL_HEADERS above configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h) +configure_file(InterfaceVersion.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceVersion.h) # grab the implementation and header files from src dirs file(GLOB INTERFACE_SRCS src/*.cpp src/*.h) diff --git a/interface/InterfaceConfig.h.in b/interface/InterfaceConfig.h.in index 802574434c..0b570f622f 100644 --- a/interface/InterfaceConfig.h.in +++ b/interface/InterfaceConfig.h.in @@ -12,5 +12,4 @@ #define GL_GLEXT_PROTOTYPES 1 @GL_HEADERS@ - #endif diff --git a/interface/InterfaceVersion.h.in b/interface/InterfaceVersion.h.in new file mode 100644 index 0000000000..b13c14bda6 --- /dev/null +++ b/interface/InterfaceVersion.h.in @@ -0,0 +1,9 @@ +// +// InterfaceVersion.h +// Declaration of version and buidl variables +// +// Created by Leonardo Murillo on 12/16/13. +// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved. +// + +const int BUILD_VERSION = @BUILD_SEQ@; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 90d7fdb22a..bf7fef57a5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -49,6 +49,7 @@ #include "Application.h" #include "DataServerClient.h" +#include "InterfaceVersion.h" #include "LogDisplay.h" #include "Menu.h" #include "Swatch.h" @@ -144,6 +145,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : _applicationStartupTime = startup_time; _window->setWindowTitle("Interface"); + qDebug( "[VERSION] Build sequence: %i", BUILD_VERSION); + qInstallMessageHandler(messageHandler); unsigned int listenPort = 0; // bind to an ephemeral port by default