Skip to content

Commit

Permalink
fix cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Nickid2018 committed Jul 21, 2024
1 parent 095b151 commit 0b1a384
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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)
Expand All @@ -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(
Expand Down

0 comments on commit 0b1a384

Please sign in to comment.