Updated FLTK branch. Tried fixing pyFLTK, but failed to do so.

ggarra13 · Dec 29, 2023 · a485d4a · a485d4a
1 parent c7f6759
commit a485d4a
Show file tree

Hide file tree

Showing 5 changed files with 1,817 additions and 5 deletions.
diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
@@ -4,10 +4,12 @@
 
 include( ExternalProject )
 
-#set( FLTK_TAG master )
+set( FLTK_TAG master )
 # Stable TAG
-set(FLTK_TAG 6ea31316fb64f64d346dc4a3a30984048f5df4cd)
-
+set(FLTK_TAG 6ea31316fb64f64d346dc4a3a30984048f5df4cd) # removes Fl_Int_Vector
+#set(FLTK_TAG 05ac0247cbd902f910fa89f8d4f4fde9de904b0f)
+#set(FLTK_TAG 92e9181a0a885b2b58e002e3a5e76152763388a2 )
+#set(FLTK_TAG 20230728)
 
 set( FLTK_BUILD_SHARED_LIBS ON )  # We no longer compile static.
 

diff --git a/cmake/Modules/BuildpyFLTK.cmake b/cmake/Modules/BuildpyFLTK.cmake
@@ -5,7 +5,7 @@
 include(ExternalProject)
 
 set(pyFLTK_SVN_REPOSITORY "https://svn.code.sf.net/p/pyfltk/code/branches/fltk1.4")
-set(pyFLTK_SVN_REVISION 609)
+set(pyFLTK_SVN_REVISION 611)
 
 
 set(pyFLTK_REVISION_ARG )
@@ -67,6 +67,10 @@ set(pyFLTK_PATCH
     COMMAND
     ${CMAKE_COMMAND} -E copy_if_different
     "${PROJECT_SOURCE_DIR}/cmake/patches/pyFLTK-patch/swig/WindowShowTypemap.i"
+    "${CMAKE_BINARY_DIR}/pyFLTK-prefix/src/pyFLTK/swig/"
+    COMMAND
+    ${CMAKE_COMMAND} -E copy_if_different
+    "${PROJECT_SOURCE_DIR}/cmake/patches/pyFLTK-patch/swig/fl_string_functions.i"
     "${CMAKE_BINARY_DIR}/pyFLTK-prefix/src/pyFLTK/swig/" )
 set(pyFLTK_CONFIGURE ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py swig --enable-shared)
 set(pyFLTK_BUILD     ${pyFLTK_ENV} ${PYTHON_EXECUTABLE} setup.py build --enable-shared)

diff --git a/cmake/patches/pyFLTK-patch/swig/fl_string_functions.i b/cmake/patches/pyFLTK-patch/swig/fl_string_functions.i
@@ -0,0 +1,8 @@
+/* File : fl_string_functions.i */
+//%module fl_string_functions
+
+%{
+#include "FL/fl_string_functions.h"
+%}
+
+%include "FL/fl_string_functions.h"