SWIG: Use raw docstrings

Author: jschueller

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.13)
+cmake_minimum_required (VERSION 3.18)
 
 option (BUILD_PYTHON                 "Build the python module for the library"                               ON)
 option (USE_SPHINX                   "Use sphinx for documentation"                                          OFF)
@@ -31,6 +31,7 @@ find_package (OpenTURNS CONFIG REQUIRED)
 message (STATUS "Found OpenTURNS: ${OPENTURNS_ROOT_DIR} (found version \"${OPENTURNS_VERSION_STRING}\")")
 
 find_package (vinecopulib 0.7.1 CONFIG REQUIRED)
+message (STATUS "Found vinecopulib: ${vinecopulib_DIR} (found version \"${vinecopulib_VERSION}\")")
 
 if (NOT BUILD_SHARED_LIBS)
   list ( APPEND OTVINE_DEFINITIONS "-DOTVINE_STATIC" )
@@ -52,21 +53,20 @@ set (OTVINE_CONFIG_CMAKE_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/otvine)
 set (OTVINE_DOC_PATH ${CMAKE_INSTALL_DOCDIR})
 
 if (BUILD_PYTHON)
-  find_package (SWIG 3)
+  find_package (SWIG 4)
   include (${SWIG_USE_FILE})
 
-  if (CMAKE_VERSION VERSION_LESS 3.28)
-    find_package (Python 3.6 COMPONENTS Interpreter Development)
+  option (USE_PYTHON_SABI "Use Python stable ABI" OFF)
+  if (USE_PYTHON_SABI AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.26)
+    find_package (Python 3.6 COMPONENTS Interpreter Development.SABIModule)
+    add_library (Python::Module ALIAS Python::SABIModule)
   else ()
-    find_package (Python 3.6 COMPONENTS Interpreter Development.Module Development.SABIModule)
+    find_package (Python 3.6 COMPONENTS Interpreter Development.Module)
   endif ()
 
   if (Python_FOUND)
     include (FindPythonModule)
     find_python_module (matplotlib)
-    if (NOT TARGET Python::Module)
-      include (TargetLinkLibrariesWithDynamicLookup)
-    endif ()
 
     if (USE_SPHINX)
       find_program (SPHINX_EXECUTABLE NAMES sphinx-build DOC "Sphinx Documentation Builder (sphinx-doc.org)")

cmake/TargetLinkLibrariesWithDynamicLookup.cmake

@@ -1,8 +1,4 @@
 
-if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-  add_library (CRT_fp8 STATIC CRT_fp8.c)
-endif ()
-
 set (CHECK_ENVIRONMENT)
 
 set (CHECK_TO_BE_RUN)
@@ -12,9 +8,6 @@ macro (ot_check_test TESTNAME)
   add_dependencies(tests ${TEST_TARGET})
   target_include_directories (${TEST_TARGET} PRIVATE ${INTERNAL_INCLUDE_DIRS})
   target_link_libraries (${TEST_TARGET} PRIVATE otvine)
-  if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-    target_link_libraries (${TEST_TARGET} PRIVATE CRT_fp8)
-  endif ()
   set_target_properties (${TEST_TARGET} PROPERTIES
                          UNITY_BUILD OFF
                          INSTALL_RPATH "${PROJECT_BINARY_DIR}/lib/src;${CMAKE_INSTALL_RPATH}")

cmake/escape_backslash.cmake

@@ -15,56 +15,25 @@ macro (ot_add_python_module MODULENAME SOURCEFILE)
   endif ()
 
   set (swig_other_sources)
-  set (docstring_sources)
   foreach (it ${ARGN})
     if (${it} MATCHES ".*\\.i$")
       ot_install_swig_file (${it})
-    elseif (${it} MATCHES ".*_doc\\.i\\.in$")
-      list (APPEND docstring_sources ${it})
-
-      get_filename_component (DOCSTRING_FILE_BASENAME ${it} NAME_WE)
-      ot_install_swig_file (${CMAKE_CURRENT_BINARY_DIR}/${DOCSTRING_FILE_BASENAME}.i)
     else ()
       list (APPEND swig_other_sources "${it}")
     endif ()
   endforeach ()
 
-  # https://github.com/swig/swig/issues/1273
-  option (SWIG_FORCE_DOUBLE_ESCAPE_BACKSLASH "Force double escaping of backslashes" OFF)
-  mark_as_advanced (SWIG_FORCE_DOUBLE_ESCAPE_BACKSLASH)
-  set (TIMES x1)
-  if ((SWIG_VERSION VERSION_LESS 4) OR SWIG_FORCE_DOUBLE_ESCAPE_BACKSLASH)
-    set (TIMES x2)
-  endif ()
-
-  # handle docstring generation
-  add_custom_target (generate_${MODULENAME}_docstrings
-                      COMMAND ${CMAKE_COMMAND} -DDOCSTRING_SOURCES="${docstring_sources}"
-                      -DCURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DTIMES=${TIMES}
-                      -P ${CMAKE_SOURCE_DIR}/cmake/escape_backslash.cmake
-                      DEPENDS ${docstring_sources})
-  list (APPEND SWIG_MODULE_${MODULENAME}_python_EXTRA_DEPS generate_${MODULENAME}_docstrings)
-
   set (module_target ${MODULENAME}_python)
 
   swig_add_library (${module_target} LANGUAGE python SOURCES ${SOURCEFILE} ${swig_other_sources})
 
-  # UseSWIG generates now standard target names
-
   target_include_directories(${module_target} PRIVATE ${INTERNAL_INCLUDE_DIRS})
-  swig_link_libraries (${module_target} otvine)
 
-  if (TARGET Python::Module)
-    target_link_libraries (${module_target} Python::Module)
-  else ()
-    target_include_directories (${module_target} PRIVATE ${Python_INCLUDE_DIRS})
-    target_link_libraries_with_dynamic_lookup (${module_target} ${Python_LIBRARIES})
-  endif ()
+  target_link_libraries (${module_target} otvine)
+  target_link_libraries (${module_target} Python::Module)
 
   set_target_properties (${module_target} PROPERTIES OUTPUT_NAME ${MODULENAME})
-
   set_target_properties (${module_target} PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}")
-
   set_target_properties (${module_target} PROPERTIES UNITY_BUILD OFF)
 
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${MODULENAME}.py
@@ -78,8 +47,8 @@ endmacro ()
 
 
 ot_add_python_module( ${PACKAGE_NAME} ${PACKAGE_NAME}_module.i
-                      VineCopula.i VineCopula_doc.i.in
-                      VineCopulaFactory.i VineCopulaFactory_doc.i.in
+                      VineCopula.i VineCopula_doc.i
+                      VineCopulaFactory.i VineCopulaFactory_doc.i
                     )