Merge branch 'master' into GUI_TreeView_Item_Ordering

FreeCAD · Sep 30, 2021 · 214972f · 214972f
2 parents 2a707d2 + 5ab525d
commit 214972f
Show file tree

Hide file tree

Showing 4 changed files with 356 additions and 260 deletions.
diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake b/cMake/FreeCAD_Helpers/SetupBoost.cmake
@@ -3,7 +3,7 @@ macro(SetupBoost)
 
     set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
 
-    set (BOOST_COMPONENTS filesystem program_options regex system thread)
+    set (BOOST_COMPONENTS filesystem program_options regex system thread date_time)
     find_package(Boost ${BOOST_MIN_VERSION}
         COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
 

diff --git a/src/App/Application.cpp b/src/App/Application.cpp
@@ -39,10 +39,10 @@
 # define WINVER 0x502 // needed for SetDllDirectory
 # include <Windows.h>
 # endif
-# include <ctime>
 # include <csignal>
 # include <boost/program_options.hpp>
 # include <boost/filesystem.hpp>
+# include <boost/date_time/posix_time/posix_time.hpp>
 #endif
 
 #ifdef FC_OS_WIN32
@@ -2295,9 +2295,9 @@ void Application::runApplication()
 
 void Application::logStatus()
 {
-    time_t now;
-    time(&now);
-    Console().Log("Time = %s", ctime(&now));
+    std::string time_str = boost::posix_time::to_simple_string(
+        boost::posix_time::second_clock::local_time());
+    Console().Log("Time = %s\n", time_str.c_str());
 
     for (std::map<std::string,std::string>::iterator It = mConfig.begin();It!= mConfig.end();++It) {
         Console().Log("%s = %s\n",It->first.c_str(),It->second.c_str());

diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h
@@ -92,9 +92,9 @@
 
 #include <boost/utility.hpp>
 #include <boost_graph_adjacency_list.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <boost/program_options.hpp>
-//namespace po = boost::program_options;
 
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>