[TD-2984] <fix>: combine taosdemo and taosdemox. windows build issue.

src/kit/taosdemo/CMakeLists.txt

@@ -22,9 +22,11 @@ IF (TD_LINUX)
   ELSE ()
     TARGET_LINK_LIBRARIES(taosdemo taos cJson)
   ENDIF ()
-ENDIF ()
-
-IF (TD_DARWIN)
+ELSEIF (TD_WINDOWS)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(taosdemo ${SRC})
+  TARGET_LINK_LIBRARIES(taosdemo taos_static cJson)
+ELSEIF (TD_DARWIN)
   # missing a few dependencies, such as <argp.h>
   # AUX_SOURCE_DIRECTORY(. SRC)
   # ADD_EXECUTABLE(taosdemo ${SRC})

src/kit/taosdemo/taosdemo.c

@@ -4423,7 +4423,7 @@ void *superQueryProcess(void *sarg) {
         }
         selectAndGetResult(winfo->taos, g_queryInfo.superQueryInfo.sql[i], tmpFile); 
         int64_t t2 = taosGetTimestampUs();          
-        printf("=[taosc] thread[%"PRIu64"] complete one sql, Spent %f s\n", (uint64_t)pthread_self(), (t2 - t1)/1000000.0);          
+        printf("=[taosc] thread[%"PRIu64"] complete one sql, Spent %f s\n", pthread_self(), (t2 - t1)/1000000.0);          
       } else {
         #ifdef TD_LOWA_CURL
         int64_t t1 = taosGetTimestampUs();
@@ -4439,7 +4439,7 @@ void *superQueryProcess(void *sarg) {
       }   
     }
     et = taosGetTimestampMs();
-    printf("==thread[%"PRIu64"] complete all sqls to specify tables once queries duration:%.6fs\n\n", (uint64_t)pthread_self(), (double)(et - st)/1000.0);
+    printf("==thread[%"PRIu64"] complete all sqls to specify tables once queries duration:%.6fs\n\n", pthread_self(), (double)(et - st)/1000.0);
   }
   return NULL;
 }
@@ -4488,7 +4488,7 @@ void *subQueryProcess(void *sarg) {
       }
     }
     et = taosGetTimestampMs();
-    printf("####thread[%"PRIu64"] complete all sqls to allocate all sub-tables[%d - %d] once queries duration:%.4fs\n\n", (uint64_t)pthread_self(), winfo->start_table_id, winfo->end_table_id, (double)(et - st)/1000.0);
+    printf("####thread[%"PRIu64"] complete all sqls to allocate all sub-tables[%d - %d] once queries duration:%.4fs\n\n", pthread_self(), winfo->start_table_id, winfo->end_table_id, (double)(et - st)/1000.0);
   }
   return NULL;
 }