diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index 79a520b1b7d515f041458b62280b6a48e374339d..ba27044a8793fec53adc3b85df77443cbf18c600 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -7,7 +7,7 @@ FIND_PACKAGE(Git)
 IF (GIT_FOUND)
     MESSAGE("Git found")
     EXECUTE_PROCESS(
-        COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ../src/kit/taosdemo/taosdemo.c
+        COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_COMMIT)
     EXECUTE_PROCESS(
@@ -15,7 +15,7 @@ IF (GIT_FOUND)
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_COMMIT_SHA1)
     EXECUTE_PROCESS(
-        COMMAND ${GIT_EXECUTABLE} status -z -s ../src/kit/taosdemo/taosdemo.c
+        COMMAND ${GIT_EXECUTABLE} status -z -s ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_STATUS)
     EXECUTE_PROCESS(
@@ -44,11 +44,13 @@ ADD_DEFINITIONS(-DTAOSDEMO_COMMIT_SHA1="${TAOSDEMO_COMMIT_SHA1}")
 ADD_DEFINITIONS(-DTAOSDEMO_STATUS="${TAOSDEMO_STATUS}")
 
 MESSAGE("VERNUMBER is:" ${VERNUMBER})
-IF (VERNUMBER MATCHES "")
-    ADD_DEFINITIONS(-DTD_VERNUMBER="TDengie-version-unknown")
+IF ("${VERNUMBER}" STREQUAL "")
+    SET(TD_VERSION_NUMBER "TDengine-version-unknown")
 ELSE()
-    ADD_DEFINITIONS(-DTD_VERNUMBER="${VERNUMBER}")
+    SET(TD_VERSION_NUMBER ${VERNUMBER})
 ENDIF ()
+MESSAGE("TD_VERSION_NUMBER is:" ${TD_VERSION_NUMBER})
+ADD_DEFINITIONS(-DTD_VERNUMBER="${TD_VERSION_NUMBER}")
 
 IF (TD_LINUX)
   AUX_SOURCE_DIRECTORY(. SRC)