diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/common/config.cpp | 16 |
3 files changed, 18 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 35f548fd..affd91ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,17 +69,17 @@ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) FIND_PACKAGE(Git) IF(GIT_FOUND) EXECUTE_PROCESS( - COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - OUTPUT_VARIABLE "AMUNMT_BUILD_VERSION" - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) + COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + OUTPUT_VARIABLE "AMUNMT_BUILD_VERSION" + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) MESSAGE( STATUS "Git version: ${AMUNMT_BUILD_VERSION}" ) ELSE(GIT_FOUND) SET(AMUNMT_BUILD_VERSION 0) ENDIF(GIT_FOUND) -add_definitions(-DAMUNMT_BUILD_VERSION=${AMUNMT_BUILD_VERSION}) ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) +SET(GIT_SHA1 ${AMUNMT_BUILD_VERSION}) include_directories(${amunmt_SOURCE_DIR}/src) add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b0ed75d..d6df11c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,12 @@ include_directories(.) include_directories(3rd_party) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/common/git_version.cpp.in" + "${CMAKE_CURRENT_BINARY_DIR}/common/git_version.cpp" @ONLY) + +list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/common/git_version.cpp") + + add_library(cpumode OBJECT cpu/mblas/matrix.cpp cpu/mblas/phoenix_functions.cpp @@ -13,6 +19,7 @@ add_library(cpumode OBJECT ) add_library(libcommon OBJECT + ${CMAKE_CURRENT_BINARY_DIR}/common/git_version.cpp common/config.cpp common/exception.cpp common/filter.cpp @@ -67,17 +74,6 @@ cuda_add_library(amunmt SHARED $<TARGET_OBJECTS:libyaml-cpp> ) -#cuda_add_executable( -# nth -# gpu/nth_benchmark.cu -# gpu/mblas/matrix.cu -# $<TARGET_OBJECTS:libcommon> -# $<TARGET_OBJECTS:libcnpy> -# $<TARGET_OBJECTS:cpumode> -# $<TARGET_OBJECTS:libyaml-cpp> -#) - - else(CUDA_FOUND) add_executable( diff --git a/src/common/config.cpp b/src/common/config.cpp index 61aa82b7..a6f4d28f 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -1,15 +1,9 @@ #include <set> -#include "config.h" -#include "file_stream.h" -#include "exception.h" - -#define STRINGIFY(x) #x -#define TOSTRING(x) STRINGIFY(x) - -#ifndef AMUNMT_BUILD_VERSION -#define AMUNMT_BUILD_VERSION 000000 -#endif +#include "common/config.h" +#include "common/file_stream.h" +#include "common/exception.h" +#include "common/git_version.h" #define SET_OPTION(key, type) \ do { if(!vm_[key].defaulted() || !config_[key]) { \ @@ -260,7 +254,7 @@ void Config::AddOptions(size_t argc, char** argv) { } if (vm_["version"].as<bool>()) { - std::cerr << TOSTRING(AMUNMT_BUILD_VERSION) << std::endl; + std::cerr << AMUNMT_GIT_VERION << std::endl; exit(0); } |