fix: fix compilation issues

Author: madjesc

.cmake/FindSNMP.cmake

@@ -0,0 +1,19 @@
+# TODO: Improve the use of SNMP, right now this flags are not added to the build.
+# TODO: Test the use of SNMP
+option(ENABLE_SNMP "Force to use ICU6x (unorm2) functions" OFF)
+if(ENABLE_SNMP)
+  pkg_check_modules(SNMP REQUIRED "net-snmp>=5.3" IMPORTED_TARGET)
+  find_program(NETSNMP_CONFIG_BIN net-snmp-config REQUIRED)
+  if(NETSNMP_CONFIG_BIN)
+    exec_program(${NETSNMP_CONFIG_BIN} ARGS --cflags OUTPUT_VARIABLE _NETSNMP_CFLAGS)
+    exec_program(${NETSNMP_CONFIG_BIN} ARGS --libs OUTPUT_VARIABLE _NETSNMP_LIBS)
+
+    string(REGEX REPLACE "[\"\r\n]" " " _NETSNMP_CFLAGS "${_NETSNMP_CFLAGS}")
+    string(REGEX REPLACE "[\"\r\n]" " " _NETSNMP_LIBS "${_NETSNMP_LIBS}")
+    set(NETSNMP_CFLAGS ${_NETSNMP_CFLAGS} CACHE STRING "CFLAGS for net-snmp lib")
+    set(NETSNMP_LIBS ${_NETSNMP_LIBS} CACHE STRING "linker options for net-snmp lib")
+    set(NETSNMP_FOUND TRUE CACHE BOOL "net-snmp is found")
+  else()
+    set (NETSNMP_FOUND FALSE CACHE BOOL "net-snmp is not found")
+  endif()
+endif()

CMakeLists.txt

@@ -1,19 +1,21 @@
-cmake_minimum_required(VERSION 3.20)
-project(ltfs,
-  # TODO: Find a better solution to mark this version as different from the official build
-  VERSION "2.5.0.9999"
-)
+cmake_minimum_required(VERSION 3.26)
+project(ltfs
+  LANGUAGES C)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.cmake")
+
 include(CheckSymbolExists REQUIRED)
 include(CheckTypeSize REQUIRED)
 include(CheckLibraryExists REQUIRED)
 include(CheckIncludeFiles REQUIRED)
 include(GNUInstallDirs REQUIRED)
 
+find_package(SNMP REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 find_package(ICU COMPONENTS uc)
 find_package(LibXml2 REQUIRED)
 
+check_type_size(time_t SIZEOF_TIME_T)
 add_compile_definitions(_GNU_SOURCE __CMAKE_BUILD)
 
 pkg_check_modules(FUSE REQUIRED "fuse>=2.6.0" IMPORTED_TARGET)
@@ -29,29 +31,3 @@ endif()
 
 add_subdirectory(messages)
 add_subdirectory(src)
-
-# TODO: Improve the use of SNMP, right now this flags are not added to the build.
-# TODO: Test the use of SNMP
-option(ENABLE_SNMP "Force to use ICU6x (unorm2) functions" OFF)
-if(ENABLE_SNMP)
-  pkg_check_modules(SNMP REQUIRED "net-snmp>=5.3" IMPORTED_TARGET)
-  find_program(NETSNMP_CONFIG_BIN net-snmp-config REQUIRED)
-  if(NETSNMP_CONFIG_BIN)
-    exec_program(${NETSNMP_CONFIG_BIN} ARGS --cflags OUTPUT_VARIABLE _NETSNMP_CFLAGS)
-    exec_program(${NETSNMP_CONFIG_BIN} ARGS --libs OUTPUT_VARIABLE _NETSNMP_LIBS)
-
-    string(REGEX REPLACE "[\"\r\n]" " " _NETSNMP_CFLAGS "${_NETSNMP_CFLAGS}")
-    string(REGEX REPLACE "[\"\r\n]" " " _NETSNMP_LIBS "${_NETSNMP_LIBS}")
-    set(NETSNMP_CFLAGS ${_NETSNMP_CFLAGS} CACHE STRING "CFLAGS for net-snmp lib")
-    set(NETSNMP_LIBS ${_NETSNMP_LIBS} CACHE STRING "linker options for net-snmp lib")
-    set(NETSNMP_FOUND TRUE CACHE BOOL "net-snmp is found")
-  else()
-    set (NETSNMP_FOUND FALSE CACHE BOOL "net-snmp is not found")
-  endif()
-endif()
-
-
-check_type_size(time_t SIZEOF_TIME_T)
-add_compile_definitions(
-  SIZEOF_TIME_T=${SIZEOF_TIME_T}
-)

build/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

messages/CMakeLists.txt

@@ -21,20 +21,13 @@ set(MESSAGES_LIBS
 foreach(NAME IN LISTS MESSAGES_LIBS)
   file(GLOB SRCS "${NAME}/*.txt")
 
-  # Compile the message resources using genrb and pkgdata see make_message_src.sh
-  add_custom_command(
-    OUTPUT "res_${NAME}/lib${NAME}.a"
-    COMMAND mkdir -p res_${NAME}
-    COMMAND ${ICU_GENRB_EXECUTABLE} -q ${SRCS} -d res_${NAME} 1> /dev/null
-    COMMAND find res_${NAME} -name *.res > res_${NAME}/paths.txt
-    COMMAND ${ICU_PKGDATA_EXECUTABLE} -d res_${NAME}/ -m static -p ${NAME} -q res_${NAME}/paths.txt 1> /dev/null
-    BYPRODUCTS "res_${NAME}"
-  )
   # Add the command as a target to be build when all is invoked
   add_custom_target("${NAME}.a" ALL
-    cp res_${NAME}/lib${NAME}.a lib${NAME}.a
-    DEPENDS "res_${NAME}/lib${NAME}.a"
-    BYPRODUCTS lib${NAME}.a
+    ${ICU_GENRB_EXECUTABLE} -q ${SRCS} 1> /dev/null
+    COMMAND ls *.res > paths.txt
+    COMMAND ${ICU_PKGDATA_EXECUTABLE} -m static -p ${NAME} -q paths.txt 1> /dev/null
+    COMMAND cp lib${NAME}.a ..
+    WORKING_DIRECTORY res_${NAME}
   )
 
   # Define the library as an imported CMake lib