diff options
| author |   Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-12 13:34:36 +0200 |
|---|---|---|
| committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-14 14:04:51 +0200 |
| commit | 757c16403ef30a498477dda53ffdcbe634f27c80 (patch) | |
| tree | 1ff7b950a0af72974463f268fcd838552556d199 | |
| parent | dc539df27ac3009a5e29f6a537a66b86708387c5 (diff) | |
cmake/config: use /etc/layers.json, install it to there too.
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/config.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f5aaa1d..54e2da6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,3 +81,8 @@ set(LINK_LIBCXX OFF CACHE BOOL "Link against LLVMs libc++") add_subdirectory(client-lib) add_subdirectory(src) + +install( + FILES layers.json + DESTINATION /etc + COMPONENT "runtime") diff --git a/src/config.cpp b/src/config.cpp index 1393fdd..b610c6e 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -20,8 +20,7 @@ namespace wm { config::config() : cfg() { // Supply default values for these... - this->cfg["layers.json"] = getenv("LAYERS_JSON") ?: "../layers.json"; - this->cfg["layout.json"] = getenv("LAYOUT_JSON") ?: "../layout.json"; + this->cfg["layers.json"] = getenv("LAYERS_JSON") ?: "/etc/layers.json"; } } // namespace wm |