sway

commit c948432fb460fbd6d9304034293dcf691a30a628
parent 2289029fabe919c670e19ed24baeac74846bc7b3
Author: minus <minus@mnus.de>
Date:   Thu, 27 Aug 2015 00:06:09 +0200

fixed json-c CMake inclusion

Diffstat:
A
CMake/FindJsonC.cmake
 | 
17
+++++++++++++++++
M
CMakeLists.txt
 | 
7
+++----

2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/CMake/FindJsonC.cmake b/CMake/FindJsonC.cmake
@@ -0,0 +1,17 @@
+# - Find json-c
+# Find the json-c libraries
+#
+#  This module defines the following variables:
+#     JSONC_FOUND        - True if JSONC is found
+#     JSONC_LIBRARIES    - JSONC libraries
+#     JSONC_INCLUDE_DIRS - JSONC include directories
+#
+
+find_package(PkgConfig)
+pkg_check_modules(PC_JSONC QUIET JSONC)
+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
@@ -22,15 +22,14 @@ find_package(XKBCommon REQUIRED)
 find_package(WLC REQUIRED)
 find_package(A2X REQUIRED)
 find_package(PCRE REQUIRED)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(JSON REQUIRED json-c)
+find_package(JsonC REQUIRED)
 
 FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c)
 
 include_directories(
    ${WLC_INCLUDE_DIRS}
    ${PCRE_INCLUDE_DIRS}
-   ${JSON_INCLUDE_DIRS}
+   ${JSONC_INCLUDE_DIRS}
    include/
 )
 
@@ -42,7 +41,7 @@ target_link_libraries(sway
    ${WLC_LIBRARIES}
    ${XKBCOMMON_LIBRARIES}
    ${PCRE_LIBRARIES}
-   ${JSON_LIBRARIES}
+   ${JSONC_LIBRARIES}
 )
 
 INSTALL(