From 0b1a38433db49bdae7ba07e883ea1e172b573183 Mon Sep 17 00:00:00 2001 From: nickid2018 Date: Sun, 21 Jul 2024 15:57:51 +0800 Subject: [PATCH] fix cmake --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fadde98..acfa76a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,12 @@ file(GLOB UTILS_SOURCES "${PROJECT_SOURCE_DIR}/utils/*.c") file(GLOB UTILS_HEADERS "${PROJECT_SOURCE_DIR}/utils/*.h") list(REMOVE_ITEM SOURCES "${PROJECT_SOURCE_DIR}/check_version.c") +list(APPEND FILES_TO_BUILD ${SOURCES} ${HEADERS}) +list(APPEND FILES_TO_BUILD ${PROTOCOL_JE_SOURCES} ${PROTOCOL_JE_HEADERS}) +list(APPEND FILES_TO_BUILD ${PROTOCOL_BE_SOURCES} ${PROTOCOL_BE_HEADERS}) +list(APPEND FILES_TO_BUILD ${PROTOCOL_SOURCES} ${PROTOCOL_HEADERS}) +list(APPEND FILES_TO_BUILD ${UTILS_SOURCES} ${UTILS_HEADERS}) + set(WIRESHARK_DIR $ENV{WIRESHARK_DIR}) set(WIRESHARK_BUILD_DIR $ENV{WIRESHARK_BUILD_DIR}) set(WIRESHARK_LIB_DIR $ENV{WIRESHARK_LIB_DIR}) @@ -69,6 +75,8 @@ if (DEFINED ENV{WIRESHARK_LIB_DIR}) GIT_TAG v1.7.14 ) FetchContent_MakeAvailable(cJSON) + include_directories(${cJSON_SOURCE_DIR}) + list(APPEND FILES_TO_BUILD ${cJSON_SOURCE_DIR}/cJSON.c ${cJSON_SOURCE_DIR}/cJSON.h) else () find_package(PkgConfig) pkg_check_modules(wireshark REQUIRED IMPORTED_TARGET wireshark) @@ -82,13 +90,7 @@ else () endif () include_directories(".") -add_library(MC_Dissector SHARED - ${SOURCES} ${HEADERS} - ${PROTOCOL_JE_SOURCES} ${PROTOCOL_JE_HEADERS} - ${PROTOCOL_BE_SOURCES} ${PROTOCOL_BE_HEADERS} - ${PROTOCOL_SOURCES} ${PROTOCOL_HEADERS} - ${UTILS_SOURCES} ${UTILS_HEADERS} -) +add_library(MC_Dissector SHARED ${FILES_TO_BUILD}) if (DEFINED ENV{WIRESHARK_LIB_DIR}) try_compile(