Преглед изворни кода

Merge topic 'test-fltk_wrap_ui'

f98ae28e Tests: Cover fltk_wrap_ui on an executable that links libraries
Brad King пре 10 година
родитељ
комит
1d9c539cf7
3 измењених фајлова са 7 додато и 4 уклоњено
  1. 6 4
      Tests/Wrapping/CMakeLists.txt
  2. 0 0
      Tests/Wrapping/fltk2.fl
  3. 1 0
      Tests/Wrapping/wrapFLTK.c

+ 6 - 4
Tests/Wrapping/CMakeLists.txt

@@ -85,16 +85,18 @@ endif ()
 # Since FLTK_FLUID_EXE is supposed to create a .cxx/.h from a .fl/.fld,
 # Since FLTK_FLUID_EXE is supposed to create a .cxx/.h from a .fl/.fld,
 # create an empty one so that the dependencies can be met.
 # create an empty one so that the dependencies can be met.
 #
 #
-set (FLTK_SRCS
-  fltk1.fl
-  )
 add_executable(fakefluid fakefluid.cxx)
 add_executable(fakefluid fakefluid.cxx)
 set (FLTK_WRAP_UI "On")
 set (FLTK_WRAP_UI "On")
 set (FLTK_FLUID_EXECUTABLE fakefluid)
 set (FLTK_FLUID_EXECUTABLE fakefluid)
-fltk_wrap_ui (wraplibFLTK ${FLTK_SRCS})
+fltk_wrap_ui (wraplibFLTK fltk1.fl)
 add_library(wraplibFLTK ${wraplibFLTK_FLTK_UI_SRCS})
 add_library(wraplibFLTK ${wraplibFLTK_FLTK_UI_SRCS})
 add_dependencies(wraplibFLTK fakefluid)
 add_dependencies(wraplibFLTK fakefluid)
 add_dependencies(fakefluid Wrap)
 add_dependencies(fakefluid Wrap)
+fltk_wrap_ui (wrapFLTK fltk2.fl)
+add_executable(wrapFLTK wrapFLTK.c ${wrapFLTK_FLTK_UI_SRCS})
+target_link_libraries(wrapFLTK wraplibFLTK)
+add_dependencies(wrapFLTK fakefluid)
+
 #
 #
 # Mangled Mesa
 # Mangled Mesa
 #
 #

+ 0 - 0
Tests/Wrapping/fltk2.fl


+ 1 - 0
Tests/Wrapping/wrapFLTK.c

@@ -0,0 +1 @@
+int main(void) { return 0; }