diff options
author | Jan200101 <sentrycraft123@gmail.com> | 2022-09-11 23:14:54 +0200 |
---|---|---|
committer | Jan200101 <sentrycraft123@gmail.com> | 2022-09-11 23:14:54 +0200 |
commit | eadeb9f2a13577d6cd532b2a1bd306710136322a (patch) | |
tree | c8317cc0eb0ca7a9e017d92d9f7472e0966f92c0 /src/CMakeLists.txt | |
parent | 37de0cc7b0eeeefcc25173913faaefa2a7673d2c (diff) | |
download | OFQT-eadeb9f2a13577d6cd532b2a1bd306710136322a.tar.gz OFQT-eadeb9f2a13577d6cd532b2a1bd306710136322a.zip |
move over to official cmake packages, fix data race in qt frontend
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d993dba..0fdcce5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ +find_package(json-c REQUIRED) find_package(Libcurl REQUIRED) -find_package(JsonC REQUIRED) add_subdirectory(hash) add_subdirectory(vdf) add_subdirectory(threading) @@ -14,7 +14,6 @@ set(CFLAGS -Wmissing-declarations -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized ${LIBCURL_CFLAGS} - ${JSONC_CFLAGS} ) list(APPEND @@ -33,12 +32,12 @@ add_library(tvn STATIC ${CORE_SOURCES}) target_compile_options(tvn PUBLIC ${CFLAGS}) target_include_directories(tvn PUBLIC ${LIBCURL_INCLUDE_DIRS}) -target_include_directories(tvn PUBLIC ${JSONC_INCLUDE_DIRS}) target_include_directories(tvn PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(tvn LINK_PUBLIC ${LIBCURL_LIBRARIES}) -target_link_libraries(tvn LINK_PUBLIC ${JSONC_LIBRARIES}) +target_link_libraries(tvn LINK_PUBLIC json-c::json-c) target_link_libraries(tvn LINK_PUBLIC md5) target_link_libraries(tvn LINK_PUBLIC vdf) + if (WIN32) target_link_libraries(tvn LINK_PUBLIC shlwapi) endif() |