mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1438 from mariusor/explicit_json-c_version

Browse source 
Explicitly setting the version of json-c required
This commit is contained in:
Drew DeVault 2017-10-27 08:18:00 -04:00 committed by GitHub
parent d75ee3f9ce 69e9b1386f
commit ee6ed89e36
11 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMake/FindJsonC.cmake
View file

@ -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)

2
CMakeLists.txt
View file

@ -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)

2
README.de.md
View file

@ -60,7 +60,7 @@ Abhängigkeiten:
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.el.md
View file

@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.fr.md
View file

@ -55,7 +55,7 @@ Installez les dépendances :
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.it.md
View file

@ -56,7 +56,7 @@ Installa queste dipendenze:
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.ja.md
View file

@ -49,7 +49,7 @@ Swayは沢山のディストリビューションで提供されています。"
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.md
View file

@ -61,7 +61,7 @@ Install dependencies:
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.pt.md
View file

@ -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 *

2
README.ru.md
View file

@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *

2
README.uk.md
View file

@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *