Merge branch 'develop'

abdes · Nov 1, 2019 · cdad79d · cdad79d
2 parents 9b670cf + 0dbf619
commit cdad79d
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 33 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -39,15 +39,16 @@ variables:
     - make install
     - ctest -C $BUILD_TYPE --output-on-failure
 
-build:ubuntu:trusty:gcc-6:
+build:ubuntu:trusty:gcc-7:
   <<: *build_definition
   image: ubuntu:trusty
   before_script:
     - apt-get update -qq
     - apt-get install -y -qq software-properties-common python-software-properties
     - add-apt-repository ppa:ubuntu-toolchain-r/test
     - apt-get update -qq
-    - apt-get install -y -qq wget git build-essential gcc-6 g++-6
+    - apt-get install -y -qq wget git build-essential gcc-7 g++-7
+    - apt-get install -y -qq xorg-dev libglu1-mesa-dev
   variables:
-    CC: gcc-6
-    CXX: g++-6
+    CC: gcc-7
+    CXX: g++-7
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,7 @@ set(META_AUTHOR_DOMAIN       "https://github.com/abdes/asap")
 set(META_AUTHOR_MAINTAINER   "Abdessattar Sassi (abde.sassi gmail account)")
 set(META_VERSION_MAJOR       "0")
 set(META_VERSION_MINOR       "9")
-set(META_VERSION_PATCH       "2")
+set(META_VERSION_PATCH       "3")
 set(META_VERSION_REVISION    "${GIT_REV}")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_NAME_VERSION        "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")

diff --git a/README.md b/README.md
@@ -11,13 +11,13 @@
 | Windows | [![Windows][21]][20] |
 
 [0]: https://travis-ci.org/abdes/asap_app_imgui
-[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/9
-[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/10
-[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/11
-[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/12
-[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/13
+[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/9
+[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/10
+[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/11
+[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/12
+[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/13
 [20]: https://ci.appveyor.com/project/abdes/asap-app-imgui
-[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/master?svg=true
+[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/develop?svg=true
 
 # Starter project with minimum necessary functionality
   - use cmake for the build system

diff --git a/common b/common
diff --git a/filesystem b/filesystem
diff --git a/imgui b/imgui
diff --git a/main/src/imgui_runner.cpp b/main/src/imgui_runner.cpp
@@ -490,14 +490,14 @@ void ImGuiRunner::LoadSetting() {
   if (asap::filesystem::exists(display_settings)) {
     try {
       config = cpptoml::parse_file(display_settings.string());
-      ASLOG(info, "display settings loaded from {}", display_settings);
+      ASLOG(info, "display settings loaded from {}", display_settings.string());
       has_config = true;
     } catch (std::exception const &ex) {
       ASLOG(error, "error () while loading settings from {}", ex.what(),
-            display_settings);
+            display_settings.string());
     }
   } else {
-    ASLOG(info, "file {} does not exist", display_settings);
+    ASLOG(info, "file {} does not exist", display_settings.string());
   }
 
   int width = 800;

diff --git a/main/src/ui/application_base.cpp b/main/src/ui/application_base.cpp
@@ -191,8 +191,8 @@ float ApplicationBase::DrawMainMenu() {
 void ApplicationBase::DrawStatusBar(float width, float height, float pos_x,
                                     float pos_y) {
   // Draw status bar (no docking)
-  ImGui::SetNextWindowSize(ImVec2(width, height), ImGuiSetCond_Always);
-  ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiSetCond_Always);
+  ImGui::SetNextWindowSize(ImVec2(width, height), ImGuiCond_Always);
+  ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiCond_Always);
   ImGui::Begin("statusbar", nullptr,
                ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoSavedSettings |
                    ImGuiWindowFlags_NoBringToFrontOnFocus |

diff --git a/main/src/ui/log/sink.cpp b/main/src/ui/log/sink.cpp
@@ -290,7 +290,7 @@ namespace asap {
       color_range_end = static_cast<std::size_t>(ostr.tellp());
     }
     if (show_logger_) {
-      ostr << "[" << *msg.logger_name << "] ";
+      ostr.put('[').write(msg.logger_name.data(), msg.logger_name.size()).write("] ", 2);
     }
     auto properties = ostr.str();
 
@@ -431,7 +431,7 @@ namespace asap {
               log_settings.string());
       }
     } else {
-      ASLOG(info, "file {} does not exist", log_settings);
+      ASLOG(info, "file {} does not exist", log_settings.string());
     }
 
     if (has_config) {

diff --git a/main/src/ui/style/theme.cpp b/main/src/ui/style/theme.cpp
@@ -668,15 +668,15 @@ void Theme::LoadStyle() {
     try {
       config = cpptoml::parse_file(theme_settings.string());
       ASLOG_TO_LOGGER(logger, info, "theme settings loaded from {}",
-                      theme_settings);
+                      theme_settings.string());
       has_config = true;
     } catch (std::exception const &ex) {
       ASLOG_TO_LOGGER(logger, error,
                       "error () while loading theme settings from {}",
-                      ex.what(), theme_settings);
+                      ex.what(), theme_settings.string());
     }
   } else {
-    ASLOG_TO_LOGGER(logger, info, "file {} does not exist", theme_settings);
+    ASLOG_TO_LOGGER(logger, info, "file {} does not exist", theme_settings.string());
   }
 
   if (has_config) {

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -5,17 +5,16 @@
 
 message("=> [third-party modules]")
 
-# Boost
-#set(BOOST_URL https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 CACHE STRING "Boost download URL" FORCE)
-#set(BOOST_URL_SHA256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba CACHE STRING "Boost download URL SHA256 checksum" FORCE)
-#add_subdirectory(boost-cmake)
-
 # Catch2
 # EXCLUDE_FROM_ALL to not have it install its files during install
 add_subdirectory(catch2 EXCLUDE_FROM_ALL)
 
 # spdlog
 SET(SPDLOG_BUILD_TESTING OFF CACHE BOOL "Build spdlog tests")
+SET(SPDLOG_INSTALL ON CACHE BOOL "Generate the spdlog install target")
+if(NOT (WIN32 OR MINGW))
+  SET(SPDLOG_BUILD_SHARED ${BUILD_SHARED_LIBS} CACHE BOOL "Build spdlog as a shared library")
+endif()
 add_subdirectory(spdlog)
 
 # GLFW

diff --git a/third_party/catch2 b/third_party/catch2
diff --git a/third_party/cxxopts b/third_party/cxxopts
diff --git a/third_party/date b/third_party/date
diff --git a/third_party/spdlog b/third_party/spdlog
+5 −0		CHANGELOG.md
+16 −2		README.md
+61 −38		include/cxxopts.hpp
+11 −0		src/example.cpp
+137 −1		test/options.cpp
+0 −11		CMakeLists.txt
+2 −5		README.md
+1,067 −1,380		include/date/date.h
+5 −5		include/date/islamic.h
+3 −3		include/date/iso_week.h
+3 −3		include/date/julian.h
+1 −1		include/date/ptz.h
+239 −428		include/date/tz.h
+5 −15		src/tz.cpp
+8 −34		test/clock_cast_test/custom_clock.pass.cpp
+0 −132		test/clock_cast_test/local_t.pass.cpp
+1 −5		test/clock_cast_test/noncastable.pass.cpp
+2 −2		test/clock_cast_test/to_sys_return_utc_time.fail.cpp
+0 −328		test/date_test/durations_output.pass.cpp
+4 −4		test/date_test/format/range.pass.cpp
+0 −297		test/date_test/multi_year_duration_addition.pass.cpp
+3 −2		test/date_test/weekday.pass.cpp
+1 −1		test/date_test/year.pass.cpp
+1 −1		test/iso_week/weekday.pass.cpp
+0 −22		test/tz_test/zone.pass.cpp