diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-23 19:13:00 -0700 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-23 19:13:00 -0700 |
| commit | 80a040ac772132a8d8e7385c0261f545adc88aee (patch) | |
| tree | 682a57288e9f1fdde230b075e5ab354adc1b2c07 /src | |
| parent | 121960a2eb2141ac9313803b88f9adb043407475 (diff) | |
fixes to scm_rev generation to make it conistent with windows build
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/common/scm_rev.cpp.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 1495e433b1..5eaf673652 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,4 +1,4 @@ -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/scm_rev.cpp" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY) set(SRCS break_points.cpp console_listener.cpp @@ -13,10 +13,10 @@ set(SRCS break_points.cpp misc.cpp msg_handler.cpp string_util.cpp + scm_rev.cpp symbols.cpp thread.cpp timer.cpp - utf8.cpp - ${CMAKE_CURRENT_BINARY_DIR}/scm_rev.cpp) + utf8.cpp) add_library(common STATIC ${SRCS}) diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 9e2bcfdd8d..512c5bd4ce 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in @@ -5,13 +5,13 @@ #include "common/scm_rev.h" #define GIT_REV "@GIT_REV@" -#define GIT_REF_SPEC "@GIT_REF_SPEC@" +#define GIT_BRANCH "@GIT_BRANCH@" #define GIT_DESC "@GIT_DESC@" namespace Common { const char g_scm_rev[] = GIT_REV; -const char g_scm_ref_spec[] = GIT_REF_SPEC; +const char g_scm_ref_spec[] = GIT_BRANCH; const char g_scm_desc[] = GIT_DESC; } // namespace |