Merge pull request #89 from sy-c/master

v2.6.0

Author: sy-c

CMakeLists.txt

@@ -45,7 +45,7 @@ add_subdirectory(doc)
 #find_package(Common REQUIRED)
 find_package(Boost REQUIRED)
 find_package(MySQL)
-find_package(SWIG 3.0.12)
+find_package(SWIG 4.2.0)
 
 # flag to build only client library
 #set(INFOLOGGER_BUILD_LIBONLY 1)
@@ -295,7 +295,7 @@ target_link_libraries(
 
 # generate libraries for other languages with SWIG
 if(SWIG_FOUND)
-  include(${SWIG_USE_FILE})
+  include (UseSWIG)
   message("Generating extra languages libraries with SWIG")
 
   set_property(SOURCE src/infoLogger.i PROPERTY CPLUSPLUS ON)
@@ -318,15 +318,20 @@ if(SWIG_FOUND)
   endif()
 
   # library for Python
-  find_package(PythonLibs)
-  if (PYTHONLIBS_FOUND)
+  find_package(Python3 COMPONENTS Interpreter Development)
+  if (PYTHON3_FOUND)
   message("Bindings for Python will be generated")
+  #message("Python_FOUND:${Python3_FOUND}")
+  #message("Python_VERSION:${Python3_VERSION}")
+  #message("Python_Development_FOUND:${Python3_Development_FOUND}")
+  #message("Python_LIBRARIES:${Python3_LIBRARIES}")
+  #message("Python include: ${Python3_INCLUDE_DIRS}")
   set(CMAKE_SWIG_FLAGS -module infoLoggerForPython)
-  swig_add_library(infoLoggerForPython LANGUAGE python SOURCES src/infoLogger.i  ${INFOLOGGER_LIB_OBJECTS})
-  target_include_directories(${SWIG_MODULE_infoLoggerForPython_REAL_NAME} PRIVATE ${INFOLOGGER_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH})
-  target_link_libraries(${SWIG_MODULE_infoLoggerForPython_REAL_NAME} ${PYTHON_LIBRARIES})
-  message("linking with ${PYTHON_LIBRARIES}")
-  set_target_properties(${SWIG_MODULE_infoLoggerForPython_REAL_NAME} PROPERTIES OUTPUT_NAME _infoLoggerForPython)
+  swig_add_library(infoLoggerForPython LANGUAGE python SOURCES src/infoLogger.i ${INFOLOGGER_LIB_OBJECTS})
+  target_include_directories(${SWIG_MODULE_infoLoggerForPython_REAL_NAME} PRIVATE ${INFOLOGGER_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS})
+  target_link_libraries(${SWIG_MODULE_infoLoggerForPython_REAL_NAME} ${Python3_LIBRARIES})
+  message("linking with ${Python3_LIBRARIES}")
+  #set_target_properties(${SWIG_MODULE_infoLoggerForPython_REAL_NAME} PROPERTIES OUTPUT_NAME _infoLoggerForPython)
   install(TARGETS ${SWIG_MODULE_infoLoggerForPython_REAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/infoLoggerForPython.py DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()

doc/releaseNotes.md

@@ -138,3 +138,6 @@ This file describes the main feature changes for each InfoLogger released versio
 
 ## v2.5.4 - 09/10/2023
 - Updated InfoLoggerFMQ.hxx with new FMQ severities.
+
+## v2.6.0 - 24/01/2024
+- Updated SWIG version requirement to allow generation of Python3 bindings.