tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 1a30d61..bea8d7c 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -50,13 +50,6 @@ include(FetchContent)
6
7 set(CMAKE_VERBOSE_MAKEFILE ON)
8
9-#========================================== PRE-CHECKS ============================================#
10-include(FindGit)
11-find_package(Git)
12-
13-if (NOT Git_FOUND)
14- message(FATAL_ERROR "Required package 'Git' not found on system.")
15-endif ()
16
17 #======================================== LIB IMPORTS =============================================#
18 # ======= #
19@@ -68,28 +61,9 @@ include_directories(${OPENSSL_INCLUDE_DIR})
20 # ============== #
21 # JSON-C library #
22 # ============== #
23-set(JSONC_DOWNLOAD_PATH "${TEMP_DIR_PATH}/libjsonc")
24-set(JSONC_INSTALL_PATH "${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}")
25-
26-add_custom_target(make-jsonc-install-dir ALL
27- COMMAND ${CMAKE_COMMAND} -E make_directory ${JSONC_INSTALL_PATH}
28-)
29-
30-ExternalProject_Add(libjsonc
31- PREFIX "${JSONC_DOWNLOAD_PATH}"
32- SOURCE_DIR "${JSONC_DOWNLOAD_PATH}/src/libjsonc-build"
33- GIT_REPOSITORY "https://github.com/json-c/json-c.git"
34- CMAKE_ARGS "-DBUILD_STATIC_LIBS=ON"
35- "-DBUILD_SHARED_LIBS=OFF"
36- "-DCMAKE_INSTALL_PREFIX:PATH=${JSONC_INSTALL_PATH}"
37- "-DHAVE_ARC4RANDOM=OFF"
38- "-DCMAKE_BUILD_TYPE=release"
39-)
40-
41-set(JSONC_LIBRARIES
42- ${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/lib/libjson-c.a
43- bsd
44-)
45+find_package(PkgConfig REQUIRED)
46+pkg_check_modules(JSONC REQUIRED json-c)
47+include_directories(${JSONC_INCLUDE_DIRS})
48
49 # ============ #
50 # Curl library #
51@@ -408,7 +382,7 @@ add_subdirectory(docs)
52 #endforeach()
53
54 add_executable(ctune ${SOURCE_FILES})
55-add_dependencies(ctune ctune_logger libjsonc)
56+add_dependencies(ctune ctune_logger)
57 include_directories(${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/include)
58
59 add_dependencies(ctune ${CTUNE_PLUGIN_LIST_AUDIO_PLAYER})