aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-10-27 08:18:00 -0400
committerDrew DeVault <sir@cmpwn.com>2017-10-30 17:23:35 -0400
commitb333fdff6134c50a576433e8e9b43f58aea7e44c (patch)
treead7b8b58b12924e640c93f549fa33933936f558b
parent1bc91e0a0949e429c96b1bc65a7222cb4797e0c9 (diff)
downloadsway-b333fdff6134c50a576433e8e9b43f58aea7e44c.zip
sway-b333fdff6134c50a576433e8e9b43f58aea7e44c.tar.gz
sway-b333fdff6134c50a576433e8e9b43f58aea7e44c.tar.bz2
Merge pull request #1438 from mariusor/explicit_json-c_version
Explicitly setting the version of json-c required
-rw-r--r--CMake/FindJsonC.cmake16
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.de.md2
-rw-r--r--README.el.md2
-rw-r--r--README.fr.md2
-rw-r--r--README.it.md2
-rw-r--r--README.ja.md2
-rw-r--r--README.md2
-rw-r--r--README.pt.md2
-rw-r--r--README.ru.md2
-rw-r--r--README.uk.md2
11 files changed, 24 insertions, 12 deletions
diff --git a/CMake/FindJsonC.cmake b/CMake/FindJsonC.cmake
index 2ca0df3..bbf6930 100644
--- a/CMake/FindJsonC.cmake
+++ b/CMake/FindJsonC.cmake
@@ -8,10 +8,22 @@
#
find_package(PkgConfig)
-pkg_check_modules(PC_JSONC QUIET JSONC)
+
+if (JsonC_FIND_REQUIRED)
+ set(_pkgconfig_REQUIRED "REQUIRED")
+else()
+ set(_pkgconfig_REQUIRED "")
+endif()
+
+if(JsonC_FIND_VERSION)
+ pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c=${JsonC_FIND_VERSION})
+else()
+ pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c)
+endif()
+
find_path(JSONC_INCLUDE_DIRS NAMES json-c/json.h HINTS ${PC_JSONC_INCLUDE_DIRS})
find_library(JSONC_LIBRARIES NAMES json-c HINTS ${PC_JSONC_LIBRARY_DIRS})
-
include(FindPackageHandleStandardArgs)
+
find_package_handle_standard_args(JSONC DEFAULT_MSG JSONC_LIBRARIES JSONC_INCLUDE_DIRS)
mark_as_advanced(JSONC_LIBRARIES JSONC_INCLUDE_DIRS)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b253f1f..bf37d9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ if (LD_LIBRARY_PATH)
add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}")
endif()
-find_package(JsonC REQUIRED)
+find_package(JsonC 0.12.1 REQUIRED)
find_package(PCRE REQUIRED)
find_package(WLC REQUIRED)
find_package(Wayland REQUIRED)
diff --git a/README.de.md b/README.de.md
index 92a15b9..1b0811f 100644
--- a/README.de.md
+++ b/README.de.md
@@ -60,7 +60,7 @@ Abhängigkeiten:
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.el.md b/README.el.md
index 1e5b835..03a49ae 100644
--- a/README.el.md
+++ b/README.el.md
@@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.fr.md b/README.fr.md
index 03b5a80..060ae06 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -55,7 +55,7 @@ Installez les dépendances :
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.it.md b/README.it.md
index ca3e1ea..58b965d 100644
--- a/README.it.md
+++ b/README.it.md
@@ -56,7 +56,7 @@ Installa queste dipendenze:
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.ja.md b/README.ja.md
index 7573ecc..f8cbecb 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -49,7 +49,7 @@ Swayは沢山のディストリビューションで提供されています。"
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.md b/README.md
index 9dbbfdf..33d52fb 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Install dependencies:
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.pt.md b/README.pt.md
index 9682762..7d105e4 100644
--- a/README.pt.md
+++ b/README.pt.md
@@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências:
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.ru.md b/README.ru.md
index 891adf9..2a27247 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
diff --git a/README.uk.md b/README.uk.md
index 02b6480..7cb3b95 100644
--- a/README.uk.md
+++ b/README.uk.md
@@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а
* libcap
* asciidoc
* pcre
-* json-c
+* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *