pyrox.dev
1diff --git a/CMakeLists.txt.orig b/CMakeLists.txt
2index ac0488e..a3724bc 100644
3--- a/CMakeLists.txt.orig
4+++ b/CMakeLists.txt
5@@ -50,14 +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 # OpenSSL #
20@@ -65,40 +57,17 @@ endif ()
21 find_package(OpenSSL REQUIRED)
22 include_directories(${OPENSSL_INCLUDE_DIR})
23
24-# ============== #
25-# JSON-C library #
26-# ============== #
27-set(JSONC_DOWNLOAD_PATH "${TEMP_DIR_PATH}/libjsonc")
28-set(JSONC_INSTALL_PATH "${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}")
29-
30-add_custom_target(make-jsonc-install-dir ALL
31- COMMAND ${CMAKE_COMMAND} -E make_directory ${JSONC_INSTALL_PATH}
32-)
33-
34-ExternalProject_Add(libjsonc
35- PREFIX "${JSONC_DOWNLOAD_PATH}"
36- SOURCE_DIR "${JSONC_DOWNLOAD_PATH}/src/libjsonc-build"
37- GIT_REPOSITORY "https://github.com/json-c/json-c.git"
38- GIT_TAG "json-c-0.18-20240915"
39- CMAKE_ARGS "-DBUILD_STATIC_LIBS=ON"
40- "-DBUILD_SHARED_LIBS=OFF"
41- "-DCMAKE_INSTALL_PREFIX:PATH=${JSONC_INSTALL_PATH}"
42- "-DHAVE_ARC4RANDOM=OFF"
43- "-DCMAKE_BUILD_TYPE=release"
44- "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
45-)
46-
47-set(JSONC_LIBRARIES
48- ${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/lib/libjson-c.a
49-# bsd
50-)
51-
52 # ============ #
53 # Curl library #
54 # ============ #
55 find_package(CURL REQUIRED)
56 include_directories(${CURL_INCLUDE_DIR})
57
58+find_package(PkgConfig REQUIRED)
59+pkg_check_modules(JSONC REQUIRED json-c)
60+include_directories(${JSONC_INCLUDE_DIRS})
61+
62+
63 # ================================ #
64 # nCurses - for the user interface #
65 # ================================ #
66@@ -410,7 +379,7 @@ add_subdirectory(docs)
67 #endforeach()
68
69 add_executable(ctune ${SOURCE_FILES})
70-add_dependencies(ctune ctune_logger libjsonc)
71+add_dependencies(ctune ctune_logger)
72 include_directories(${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/include)
73
74 add_dependencies(ctune ${CTUNE_PLUGIN_LIST_AUDIO_PLAYER})
75@@ -450,4 +419,4 @@ if(TARGET uninstall)
76
77 add_custom_target(uninstall
78 COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeUninstall.cmake)
79-endif()
80\ No newline at end of file
81+endif()