diff options
-rw-r--r-- | CMake/FindJsonC.cmake | 16 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | README.de.md | 2 | ||||
-rw-r--r-- | README.el.md | 2 | ||||
-rw-r--r-- | README.fr.md | 2 | ||||
-rw-r--r-- | README.it.md | 2 | ||||
-rw-r--r-- | README.ja.md | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | README.pt.md | 2 | ||||
-rw-r--r-- | README.ru.md | 2 | ||||
-rw-r--r-- | README.uk.md | 2 |
11 files changed, 24 insertions, 12 deletions
diff --git a/CMake/FindJsonC.cmake b/CMake/FindJsonC.cmake index 2ca0df39..bbf6930c 100644 --- a/CMake/FindJsonC.cmake +++ b/CMake/FindJsonC.cmake | |||
@@ -8,10 +8,22 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | find_package(PkgConfig) | 10 | find_package(PkgConfig) |
11 | pkg_check_modules(PC_JSONC QUIET JSONC) | 11 | |
12 | if (JsonC_FIND_REQUIRED) | ||
13 | set(_pkgconfig_REQUIRED "REQUIRED") | ||
14 | else() | ||
15 | set(_pkgconfig_REQUIRED "") | ||
16 | endif() | ||
17 | |||
18 | if(JsonC_FIND_VERSION) | ||
19 | pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c=${JsonC_FIND_VERSION}) | ||
20 | else() | ||
21 | pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c) | ||
22 | endif() | ||
23 | |||
12 | find_path(JSONC_INCLUDE_DIRS NAMES json-c/json.h HINTS ${PC_JSONC_INCLUDE_DIRS}) | 24 | find_path(JSONC_INCLUDE_DIRS NAMES json-c/json.h HINTS ${PC_JSONC_INCLUDE_DIRS}) |
13 | find_library(JSONC_LIBRARIES NAMES json-c HINTS ${PC_JSONC_LIBRARY_DIRS}) | 25 | find_library(JSONC_LIBRARIES NAMES json-c HINTS ${PC_JSONC_LIBRARY_DIRS}) |
14 | |||
15 | include(FindPackageHandleStandardArgs) | 26 | include(FindPackageHandleStandardArgs) |
27 | |||
16 | find_package_handle_standard_args(JSONC DEFAULT_MSG JSONC_LIBRARIES JSONC_INCLUDE_DIRS) | 28 | find_package_handle_standard_args(JSONC DEFAULT_MSG JSONC_LIBRARIES JSONC_INCLUDE_DIRS) |
17 | mark_as_advanced(JSONC_LIBRARIES JSONC_INCLUDE_DIRS) | 29 | mark_as_advanced(JSONC_LIBRARIES JSONC_INCLUDE_DIRS) |
diff --git a/CMakeLists.txt b/CMakeLists.txt index b253f1fc..bf37d9df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -48,7 +48,7 @@ if (LD_LIBRARY_PATH) | |||
48 | add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") | 48 | add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") |
49 | endif() | 49 | endif() |
50 | 50 | ||
51 | find_package(JsonC REQUIRED) | 51 | find_package(JsonC 0.12.1 REQUIRED) |
52 | find_package(PCRE REQUIRED) | 52 | find_package(PCRE REQUIRED) |
53 | find_package(WLC REQUIRED) | 53 | find_package(WLC REQUIRED) |
54 | find_package(Wayland REQUIRED) | 54 | find_package(Wayland REQUIRED) |
diff --git a/README.de.md b/README.de.md index 92a15b99..1b0811ff 100644 --- a/README.de.md +++ b/README.de.md | |||
@@ -60,7 +60,7 @@ Abhängigkeiten: | |||
60 | * libcap | 60 | * libcap |
61 | * asciidoc | 61 | * asciidoc |
62 | * pcre | 62 | * pcre |
63 | * json-c | 63 | * json-c <= 0.12.1 |
64 | * pango | 64 | * pango |
65 | * cairo | 65 | * cairo |
66 | * gdk-pixbuf2 * | 66 | * gdk-pixbuf2 * |
diff --git a/README.el.md b/README.el.md index 1e5b8358..03a49ae7 100644 --- a/README.el.md +++ b/README.el.md | |||
@@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ | |||
53 | * libcap | 53 | * libcap |
54 | * asciidoc | 54 | * asciidoc |
55 | * pcre | 55 | * pcre |
56 | * json-c | 56 | * json-c <= 0.12.1 |
57 | * pango | 57 | * pango |
58 | * cairo | 58 | * cairo |
59 | * gdk-pixbuf2 * | 59 | * gdk-pixbuf2 * |
diff --git a/README.fr.md b/README.fr.md index 03b5a803..060ae063 100644 --- a/README.fr.md +++ b/README.fr.md | |||
@@ -55,7 +55,7 @@ Installez les dépendances : | |||
55 | * libcap | 55 | * libcap |
56 | * asciidoc | 56 | * asciidoc |
57 | * pcre | 57 | * pcre |
58 | * json-c | 58 | * json-c <= 0.12.1 |
59 | * pango | 59 | * pango |
60 | * cairo | 60 | * cairo |
61 | * gdk-pixbuf2 * | 61 | * gdk-pixbuf2 * |
diff --git a/README.it.md b/README.it.md index ca3e1ea3..58b965d8 100644 --- a/README.it.md +++ b/README.it.md | |||
@@ -56,7 +56,7 @@ Installa queste dipendenze: | |||
56 | * libcap | 56 | * libcap |
57 | * asciidoc | 57 | * asciidoc |
58 | * pcre | 58 | * pcre |
59 | * json-c | 59 | * json-c <= 0.12.1 |
60 | * pango | 60 | * pango |
61 | * cairo | 61 | * cairo |
62 | * gdk-pixbuf2 * | 62 | * gdk-pixbuf2 * |
diff --git a/README.ja.md b/README.ja.md index 7573ecc4..f8cbecb0 100644 --- a/README.ja.md +++ b/README.ja.md | |||
@@ -49,7 +49,7 @@ Swayは沢山のディストリビューションで提供されています。" | |||
49 | * libcap | 49 | * libcap |
50 | * asciidoc | 50 | * asciidoc |
51 | * pcre | 51 | * pcre |
52 | * json-c | 52 | * json-c <= 0.12.1 |
53 | * pango | 53 | * pango |
54 | * cairo | 54 | * cairo |
55 | * gdk-pixbuf2 * | 55 | * gdk-pixbuf2 * |
@@ -61,7 +61,7 @@ Install dependencies: | |||
61 | * libcap | 61 | * libcap |
62 | * asciidoc | 62 | * asciidoc |
63 | * pcre | 63 | * pcre |
64 | * json-c | 64 | * json-c <= 0.12.1 |
65 | * pango | 65 | * pango |
66 | * cairo | 66 | * cairo |
67 | * gdk-pixbuf2 * | 67 | * gdk-pixbuf2 * |
diff --git a/README.pt.md b/README.pt.md index 96827623..7d105e42 100644 --- a/README.pt.md +++ b/README.pt.md | |||
@@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências: | |||
62 | * libcap | 62 | * libcap |
63 | * asciidoc | 63 | * asciidoc |
64 | * pcre | 64 | * pcre |
65 | * json-c | 65 | * json-c <= 0.12.1 |
66 | * pango | 66 | * pango |
67 | * cairo | 67 | * cairo |
68 | * gdk-pixbuf2 * | 68 | * gdk-pixbuf2 * |
diff --git a/README.ru.md b/README.ru.md index 891adf99..2a27247c 100644 --- a/README.ru.md +++ b/README.ru.md | |||
@@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход | |||
55 | * libcap | 55 | * libcap |
56 | * asciidoc | 56 | * asciidoc |
57 | * pcre | 57 | * pcre |
58 | * json-c | 58 | * json-c <= 0.12.1 |
59 | * pango | 59 | * pango |
60 | * cairo | 60 | * cairo |
61 | * gdk-pixbuf2 * | 61 | * gdk-pixbuf2 * |
diff --git a/README.uk.md b/README.uk.md index 02b64804..7cb3b95f 100644 --- a/README.uk.md +++ b/README.uk.md | |||
@@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а | |||
62 | * libcap | 62 | * libcap |
63 | * asciidoc | 63 | * asciidoc |
64 | * pcre | 64 | * pcre |
65 | * json-c | 65 | * json-c <= 0.12.1 |
66 | * pango | 66 | * pango |
67 | * cairo | 67 | * cairo |
68 | * gdk-pixbuf2 * | 68 | * gdk-pixbuf2 * |