From 8700139addd8870629690bdd9e12d4a28c6ad2c7 Mon Sep 17 00:00:00 2001 From: ncvicchi Date: Wed, 4 Sep 2024 18:37:36 -0300 Subject: [PATCH] fix: remove rpm and popt from windows compilation --- src/CMakeLists.txt | 37 ++++++++++++++----------- src/common/data_provider/CMakeLists.txt | 22 +++++++++++---- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 300ffd9f8b..66de3e813a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,22 +7,27 @@ project(wazuh-agent) include(cmake/CommonSettings.cmake) set_common_settings() -add_subdirectory(external/rpm) - -add_custom_target( - build_procps_lib ALL - COMMAND ${CMAKE_MAKE_PROGRAM} -C ${SRC_FOLDER}/src/external/procps - COMMENT "Buiding procps library" -) - -set(LIBDB_DIR "${SRC_FOLDER}/src/external/libdb") -add_custom_target( - build_libdb ALL - COMMAND ${CMAKE_COMMAND} -E echo "Building libdb" - COMMAND ${CMAKE_COMMAND} -E chdir ${LIBDB_DIR}/build_unix ${LIBDB_DIR}/dist/configure CFLAGS="-fPIC" - COMMAND ${CMAKE_COMMAND} -E chdir ${LIBDB_DIR}/build_unix ${CMAKE_MAKE_PROGRAM} - COMMENT "Building libdb" -) +if (LINUX) + if(NOT CMAKE_CHECK_CENTOS5) + add_subdirectory(external/rpm) + endif() + + set(LIBDB_DIR "${SRC_FOLDER}/src/external/libdb") + add_custom_target( + build_libdb ALL + COMMAND ${CMAKE_COMMAND} -E echo "Building libdb" + COMMAND ${CMAKE_COMMAND} -E chdir ${LIBDB_DIR}/build_unix ${LIBDB_DIR}/dist/configure CFLAGS="-fPIC" + COMMAND ${CMAKE_COMMAND} -E chdir ${LIBDB_DIR}/build_unix ${CMAKE_MAKE_PROGRAM} + COMMENT "Building libdb" + ) + + add_custom_target( + build_procps_lib ALL + COMMAND ${CMAKE_MAKE_PROGRAM} -C ${SRC_FOLDER}/src/external/procps + COMMENT "Buiding procps library" + ) + +endif() add_subdirectory(common) add_subdirectory(modules) diff --git a/src/common/data_provider/CMakeLists.txt b/src/common/data_provider/CMakeLists.txt index c4532f05f2..fc4e597893 100644 --- a/src/common/data_provider/CMakeLists.txt +++ b/src/common/data_provider/CMakeLists.txt @@ -231,19 +231,29 @@ elseif(APPLE) target_link_libraries(sysinfo cjson ${SRC_FOLDER}/external/libplist/bin/lib/libplist-2.0.a ${iokit_lib} ${corefoundation_lib}) endif(CMAKE_SYSTEM_NAME STREQUAL "Windows") -find_library(POPT_LIBRARY libpopt) -if(NOT POPT_LIBRARY) -message(FATAL_ERROR "libpopt library not found! Aborting...") +if (LINUX) + if(NOT CMAKE_CHECK_CENTOS5) + find_library(POPT_LIBRARY libpopt.a) + set(RPM_LIBRARY rpm) + set(PROC_LIBRARY proc) + set(ARCHIVE_LIBRARY LibArchive::LibArchive) + set(PROC_LIBRARY proc) + else() + set(RPM_LIBRARY "") + set(PROC_LIBRARY "") + set(ARCHIVE_LIBRARY "") + set(PROC_LIBRARY proc) + endif() endif() target_link_libraries(sysinfo networkHelper nlohmann_json::nlohmann_json cjson unofficial::sqlite3::sqlite3 - LibArchive::LibArchive + ${ARCHIVE_LIBRARY} ${POPT_LIBRARY} - rpm - proc + ${RPM_LIBRARY} + ${PROC_LIBRARY} ${LUA_LIBRARIES}) if(CMAKE_SYSTEM_NAME STREQUAL "Linux")