fix: CMake definition for cmake specific files

Author: Mauricio

CMakeLists.txt

@@ -11,12 +11,14 @@ include(GNUInstallDirs REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 find_package(ICU COMPONENTS uc)
+find_package(LibXml2 REQUIRED)
 
-# pkg_check_modules(DL REQUIRED "libdl" IMPORTED_TARGET)
-pkg_check_modules(FUSE REQUIRED "fuse>=2.6.0" IMPORTED_TARGET)
-target_compile_definitions(PkgConfig::FUSE INTERFACE _FILE_OFFSET_BITS=64)
+add_compile_definitions(_GNU_SOURCE __CMAKE_BUILD)
 
-pkg_check_modules(XML2 REQUIRED "libxml-2.0>=2.6.16" IMPORTED_TARGET)
+pkg_check_modules(FUSE REQUIRED "fuse>=2.6.0" IMPORTED_TARGET)
+target_compile_definitions(PkgConfig::FUSE INTERFACE
+  _FILE_OFFSET_BITS=64
+)
 
 if(APPLE)
     pkg_check_modules(UUID REQUIRED "uuid>=1.6" IMPORTED_TARGET)
@@ -25,84 +27,38 @@ else()
 endif()
 
 add_subdirectory(messages)
-add_subdirectory(src/libltfs)
 add_subdirectory(src)
 
 
-# Parsing features options
-# NOTE: Is this needed? cmake can add this feature using -DUSE_UNORM2
-# option(ICU_6X "Force to use ICU6x (unorm2) functions" OFF)
-# if(ICU_6X)
-#   add_definitions(-DUSE_UNORM2)
-# endif()
-
-# option(SNMP "Force to use ICU6x (unorm2) functions" OFF)
+option(ENABLE_SNMP "Force to use ICU6x (unorm2) functions" OFF)
 if(ENABLE_SNMP)
   pkg_check_modules(SNMP REQUIRED "net-snmp>=5.3" IMPORTED_TARGET)
-endif()
+  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)
 
-# # Check libraries exists
-# check_library_exists(pthread pthread_create "" HAVE_PTHREAD)
-# if(APPLE)
-#   check_library_exists(rt clock_gettime "" HAVE_RT)
-# endif()
+    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()
 
-# if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-#   check_library_exists(cam cam_open_device "" HAVE_CAM)
-#   check_library_exists(bsdxml XML_ParserCreate "" HAVE_BSDXML)
-#   check_library_exists(mt mt_status_free "" HAVE_MT)
-#   check_library_exists(execinfo backtrace "" HAVE_EXECINFO)
-# elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-#   check_library_exists(execinfo backtrace "" HAVE_EXECINFO)
-# endif()
 
-# # Compilation requirements
-# # NOTE: Checking for standard headers is really needed?
-# set(
-#   STD_HEADERS
-#   "fcntl.h"
-#   "limits.h"
-#   "stddef.h"
-#   "stdint.h"
-#   "stdlib.h"
-#   "stdbool.h"
-#   "string.h"
-#   "sys/ioctl.h"
-#   "sys/mount.h"
-#   "sys/time.h"
-#   "termios.h"
-#   "unistd.h"
-#   "sys/sysctl.h"
-# )
-# check_include_files("${STD_HEADERS}" HAVE_STD_HEADERS)
 # check_type_size(mode_t MODE_T)
 # check_type_size(off_t OFF_T)
 # check_type_size(size_t SIZE_T)
 # check_type_size(ssize_t SSIZE_T)
-# check_type_size(time_t TIME_T)
+check_type_size(time_t SIZEOF_TIME_T)
+add_compile_definitions(
+  SIZEOF_TIME_T=${SIZEOF_TIME_T}
+)
 # check_type_size(uint8_t UINT8_T)
 # check_type_size(uint16_t UINT16_T)
 # check_type_size(uint32_t UINT32_T)
 # check_type_size(uint64_t UINT64_T)
 # check_type_size(uint64_t UINT64_T)
-# check_symbol_exists(malloc "stdlib.h" HAVE_MALLOC)
-# check_symbol_exists(strlen "string.h" HAVE_STRLEN)
-# check_symbol_exists(bzero "string.h" HAVE_BZERO)
-# check_symbol_exists(memchr "string.h" HAVE_MEMCHR)
-# check_symbol_exists(memset "string.h" HAVE_MEMSET)
-# check_symbol_exists(strcasecmp "string.h" HAVE_STRCASECMP)
-# check_symbol_exists(strdup "string.h" HAVE_STRDUP)
-# check_symbol_exists(strerror "string.h" HAVE_STRERROR)
-# check_symbol_exists(strndup "string.h" HAVE_STRNDUP)
-# check_symbol_exists(strrchr "string.h" HAVE_STRRCHR)
-# check_symbol_exists(strstr "string.h" HAVE_STRSTR)
-# check_symbol_exists(mkdir "sys/stat.h" HAVE_MKDIR)
-# check_symbol_exists(rmdir "unistd.h" HAVE_RMDIR)
-
-
-# check_library_exists(xml2 xmlTextReaderSetup "" HAVE_XML_TEXT_READER_SETUP)
-# if(HAVE_XML_TEXT_READER_SETUP)
-#   # TODO: Add add macro definitions
-# endif()
-
-# # check_symbol_exists(xmlTextReaderSetup "" HAVE_XML_TEXT_READER_SETUP)

src/CMakeLists.txt

@@ -3,16 +3,26 @@ add_executable(ltfs main.c ltfs_fuse.c)
 target_link_libraries(ltfs
   Threads::Threads
   PkgConfig::FUSE
-  PkgConfig::XML2
+  LibXml2::LibXml2
   PkgConfig::UUID
   ICU::uc
   libltfs
 )
 target_include_directories(ltfs BEFORE PUBLIC "." )
 target_compile_definitions(ltfs PRIVATE
-  _GNU_SOURCE
   LTFS_CONFIG_FILE="${SYSCONFDIR}/ltfs.conf"
   LTFS_BASE_DIR="${CMAKE_INSTALL_PREFIX}"
   PACKAGE_VERSION="${PROJECT_VERSION}"
   PACKAGE_NAME="${PROJECT_NAME}"
 )
+
+add_subdirectory(libltfs)
+
+# NOTE: Is this needed? cmake can add this feature using -DUSE_UNORM2
+option(ICU_6X "Force to use ICU6x (unorm2) functions" OFF)
+string(REPLACE "." ";" ICU_VERSION_ARRAY ${ICU_VERSION})
+list(GET ICU_VERSION_ARRAY 0 ICU_VERSION_MAJOR)
+if(ICU_6X OR ICU_VERSION_MAJOR GREATER_EQUAL "56")
+  add_compile_definitions(USE_UNORM2)
+  message(STATUS "Using ICU6x funtions")
+endif()

src/libltfs/CMakeLists.txt

@@ -10,14 +10,18 @@ target_include_directories(libltfs BEFORE PUBLIC ".." )
 target_link_libraries(libltfs
   Threads::Threads
   PkgConfig::FUSE
-  PkgConfig::XML2
+  LibXml2::LibXml2
   PkgConfig::UUID
   libbin_ltfs
   liblibltfs
   libinternal_error
   libtape_common
 )
 
+if(ENABLE_SNMP)
+  target_link_libraries(libltfs PkgConfig::SNMP)
+endif()
+
 target_compile_definitions(libltfs PRIVATE
   _GNU_SOURCE
   LTFS_CONFIG_FILE="${SYSCONFDIR}/ltfs.conf"

src/libltfs/arch/time_internal.c

@@ -56,14 +56,15 @@
 #include "libltfs/ltfslogging.h"
 #include "libltfs/arch/time_internal.h"
 
-#ifdef __APPLE__
+// TODO: Fix definition of SIZEOF_TIME_T in cmake
+#if defined(__APPLE__) || defined(__CMAKE_BUILD)
 /*
  * In OSX environment time_t is always 64-bit width.
  * It is specified by compile option of Makefile.osx because autoconf architecture is
  * not used under OSX.
  */
 #define SIZEOF_TIME_T (8)
-#else
+#elif !defined(__CMAKE_BUILD)
 #include "config.h"
 #endif
 

src/libltfs/ltfs.h

@@ -184,7 +184,7 @@ enum ltfs_index_type {
 
 #define LTFS_NO_BARCODE               "NO_BARCODE"
 
-#ifndef __APPLE_MAKEFILE__
+#if !defined(__APPLE_MAKEFILE__) && !defined(__CMAKE_BUILD)
 #include "config.h"
 #endif