From d481edb3619e251285c238c05f47a121ecd96df7 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 12 Nov 2022 13:43:34 +0100
Subject: cmake: add targets for loader, serialize, draw

---
 serialize/CMakeLists.txt   | 13 +++++++++++++
 serialize/json-helper.cpp  |  2 +-
 serialize/precomp.hpp      |  4 ++++
 serialize/tile-atlas.cpp   |  2 +-
 serialize/world-reader.cpp |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 serialize/CMakeLists.txt
 create mode 100644 serialize/precomp.hpp

(limited to 'serialize')

diff --git a/serialize/CMakeLists.txt b/serialize/CMakeLists.txt
new file mode 100644
index 00000000..65b63174
--- /dev/null
+++ b/serialize/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(self floormat-serialize)
+file(GLOB sources "*.cpp" CONFIGURE_ARGS)
+add_library(${self} STATIC "${sources}")
+target_link_libraries(
+    ${self} PUBLIC
+    floormat-loader
+    floormat
+    Magnum::Magnum
+    nlohmann_json::nlohmann_json
+)
+if(FLOORMAT_PRECOMPILED-HEADERS)
+    target_precompile_headers(${self} PRIVATE precomp.hpp)
+endif()
diff --git a/serialize/json-helper.cpp b/serialize/json-helper.cpp
index d21d48f4..eda628de 100644
--- a/serialize/json-helper.cpp
+++ b/serialize/json-helper.cpp
@@ -11,7 +11,7 @@ static T open_stream(StringView filename)
 {
     T s;
     s.open(filename.data(), mode);
-    if (!s.good())
+    if (!s)
     {
         char errbuf[128];
         constexpr auto get_error_string = []<std::size_t N> (char (&buf)[N])
diff --git a/serialize/precomp.hpp b/serialize/precomp.hpp
new file mode 100644
index 00000000..23c79b16
--- /dev/null
+++ b/serialize/precomp.hpp
@@ -0,0 +1,4 @@
+#pragma once
+#include "../src/precomp.hpp"
+#include <nlohmann/json_fwd.hpp>
+#include <nlohmann/json.hpp>
diff --git a/serialize/tile-atlas.cpp b/serialize/tile-atlas.cpp
index 451fb48c..a92dfc28 100644
--- a/serialize/tile-atlas.cpp
+++ b/serialize/tile-atlas.cpp
@@ -2,7 +2,7 @@
 #include "serialize/tile-atlas.hpp"
 #include "serialize/corrade-string.hpp"
 #include "serialize/magnum-vector2i.hpp"
-#include "loader.hpp"
+#include "loader/loader.hpp"
 #include <tuple>
 
 #include <nlohmann/json.hpp>
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index 602eabf5..2ec62015 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -2,7 +2,7 @@
 #include "world-impl.hpp"
 #include "binary-reader.inl"
 #include "src/world.hpp"
-#include "src/loader.hpp"
+#include "loader/loader.hpp"
 #include "src/tile-atlas.hpp"
 #include <cstring>
 
-- 
cgit v1.2.3