Inline resource loading code into examples for self-containment

arximboldi · Nov 18, 2019 · 4d6378e · 4d6378e
1 parent 6e9aa7a
commit 4d6378e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 69 deletions.
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -2,15 +2,9 @@
 add_custom_target(examples COMMENT "Build all examples")
 add_dependencies(check examples)
 
-# examples common code
-# ====================
-
-add_library(examples-common EXCLUDE_FROM_ALL
-  common/resources.hpp
-  common/resources.cpp)
-
-target_compile_definitions(examples-common PRIVATE LAGER_PREFIX_PATH="\\"${CMAKE_INSTALL_PREFIX}\\"")
-target_include_directories(examples-common INTERFACE common/)
+# inject LAGER_PREFIX_PATH into examples
+add_library(lager-prefix INTERFACE)
+target_compile_definitions(lager-prefix INTERFACE LAGER_PREFIX_PATH="\\"${CMAKE_INSTALL_PREFIX}\\"")
 
 # std  examples
 # ====================
@@ -34,7 +28,7 @@ set(counter_ncurses_include_directories
   ${CURSES_INCLUDE_DIR})
 set(counter_ncurses_link_libraries
   lager-debugger
-  examples-common
+  lager-prefix
   ${CURSES_LIBRARIES})
 
 add_executable(counter-ncurses EXCLUDE_FROM_ALL ${counter_ncurses_sources})
@@ -69,7 +63,7 @@ if (SDL2_FOUND AND SDL2_ttf_FOUND)
     ${SDL2_TTF_INCLUDE_DIR})
   target_link_libraries(counter-sdl2
     lager-debugger
-    examples-common
+    lager-prefix
     ${SDL2_LIBRARY}
     ${SDL2_TTF_LIBRARIES})
   add_dependencies(examples counter-sdl2)
@@ -82,7 +76,7 @@ if (SDL2_FOUND AND SDL2_ttf_FOUND)
     ${SDL2_TTF_INCLUDE_DIR})
   target_link_libraries(autopong
     lager-debugger
-    examples-common
+    lager-prefix
     ${SDL2_LIBRARY}
     ${SDL2_TTF_LIBRARIES})
   add_dependencies(examples autopong)
@@ -96,7 +90,7 @@ if (SDL2_FOUND AND SDL2_ttf_FOUND)
     ${SDL2_TTF_INCLUDE_DIR})
   target_link_libraries(autopong-debug
     lager-debugger
-    examples-common
+    lager-prefix
     ${SDL2_LIBRARY}
     ${SDL2_TTF_LIBRARIES})
   add_dependencies(examples autopong-debug)

diff --git a/example/autopong/sdl2/main.cpp b/example/autopong/sdl2/main.cpp
@@ -11,7 +11,6 @@
 //
 
 #include "../autopong.hpp"
-#include "resources.hpp"
 
 #include <SDL.h>
 #include <SDL_ttf.h>
@@ -26,12 +25,23 @@
 #include <string>
 #include <variant>
 
+#ifndef LAGER_PREFIX_PATH
+#error LAGER_PREFIX_PATH needs to be defined for examples
+#endif
+
 constexpr auto font_size = 32;
 
+inline const char* resources_path()
+{
+  auto env_resources_path = std::getenv("LAGER_RESOURCES_PATH");
+  return env_resources_path ? env_resources_path
+                            : LAGER_PREFIX_PATH "/share/lager";
+}
+
 std::string font_path()
 {
     using namespace std::string_literals;
-    return example_common::resources_path() + "/SourceSansPro-Bold.ttf"s;
+    return resources_path() + "/SourceSansPro-Bold.ttf"s;
 }
 
 struct sdl_view
@@ -144,7 +154,7 @@ int main(int argc, const char** argv)
     SDL_SetRelativeMouseMode(SDL_TRUE);
 
 #ifdef DEBUGGER
-    auto debugger = lager::http_debug_server{argc, argv, 8080, example_common::resources_path()};
+    auto debugger = lager::http_debug_server{argc, argv, 8080, resources_path()};
 #endif
     auto view = sdl_view{};
     auto loop = lager::sdl_event_loop{};

diff --git a/example/common/resources.cpp b/example/common/resources.cpp
diff --git a/example/common/resources.hpp b/example/common/resources.hpp
diff --git a/example/counter/ncurses/main.cpp b/example/counter/ncurses/main.cpp
@@ -12,7 +12,6 @@
 
 #include "../counter.hpp"
 #include "terminal.hpp"
-#include "resources.hpp"
 
 #include <lager/debug/debugger.hpp>
 #include <lager/debug/http_server.hpp>
@@ -22,8 +21,19 @@
 
 #include <zug/compose.hpp>
 
+#ifndef LAGER_PREFIX_PATH
+#error LAGER_PREFIX_PATH needs to be defined for examples
+#endif
+
 using namespace std::string_literals;
 
+inline const char* resources_path()
+{
+  auto env_resources_path = std::getenv("LAGER_RESOURCES_PATH");
+  return env_resources_path ? env_resources_path
+                            : LAGER_PREFIX_PATH "/share/lager";
+}
+
 void draw(const counter::model& c)
 {
     static const auto prelude      = "current value is "s;
@@ -62,10 +72,10 @@ int main(int argc, const char** argv)
     ::init_pair(2, COLOR_WHITE, COLOR_RED);
     ::init_pair(3, COLOR_WHITE, COLOR_BLUE);
 #if defined(DEBUGGER) || defined(TREE_DEBUGGER)
-    auto debugger = lager::http_debug_server{argc, argv, 8080, example_common::resources_path()};
+    auto debugger = lager::http_debug_server{argc, argv, 8080, resources_path()};
 #endif
 #ifdef META_DEBUGGER
-    auto meta_debugger = lager::http_debug_server{argc, argv, 8081, example_common::resources_path()};
+    auto meta_debugger = lager::http_debug_server{argc, argv, 8081, resources_path()};
 #endif
     auto store = lager::make_store<counter::action>(
         counter::model{},

diff --git a/example/counter/sdl2/main.cpp b/example/counter/sdl2/main.cpp
@@ -14,17 +14,27 @@
 #include <SDL_ttf.h>
 
 #include "../counter.hpp"
-#include "resources.hpp"
 #include <lager/event_loop/sdl.hpp>
 #include <lager/store.hpp>
 
 #include <iostream>
 #include <string>
 
+#ifndef LAGER_PREFIX_PATH
+#error LAGER_PREFIX_PATH needs to be defined for examples
+#endif
+
+inline const char* resources_path()
+{
+  auto env_resources_path = std::getenv("LAGER_RESOURCES_PATH");
+  return env_resources_path ? env_resources_path
+                            : LAGER_PREFIX_PATH "/share/lager";
+}
+
 std::string font_path()
 {
     using namespace std::string_literals;
-    return example_common::resources_path() + "/SourceSansPro-Regular.ttf"s;
+    return resources_path() + "/SourceSansPro-Regular.ttf"s;
 }
 
 struct sdl_view