add_wxwidgets_to_tools.patch 3.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687
  1. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  2. index a01d814..595190c 100644
  3. --- a/src/CMakeLists.txt
  4. +++ b/src/CMakeLists.txt
  5. @@ -5,6 +5,14 @@ project(src)
  6. include(../scripts/cmake/xtd_commands.cmake)
  7. include(../scripts/cmake/xtd_version.cmake)
  8. +find_package(PkgConfig)
  9. +pkg_check_modules(WXWIDGETS wxwidgets)
  10. +include_directories(${WXWIDGETS_INCLUDE_DIRS})
  11. +link_directories(${WXWIDGETS_LIBRARY_DIRS})
  12. +set(XTD_EXTRA_LIBS "${XTD_EXTRA_LIBS};${WXWIDGETS_LIBRARIES}")
  13. +
  14. +add_references(${XTD_EXTRA_LIBS})
  15. +
  16. set(XTD_HEADER_FILE "xtd/include/xtd/xtd.h")
  17. file(WRITE ${XTD_HEADER_FILE}
  18. "// This code was generated by CMake script.\n"
  19. diff --git a/src/xtd.forms.native.wxwidgets/CMakeLists.txt b/src/xtd.forms.native.wxwidgets/CMakeLists.txt
  20. index 263a4ab..8d35497 100644
  21. --- a/src/xtd.forms.native.wxwidgets/CMakeLists.txt
  22. +++ b/src/xtd.forms.native.wxwidgets/CMakeLists.txt
  23. @@ -18,7 +18,7 @@ endif()
  24. find_package(wxWidgets REQUIRED COMPONENTS base core xrc)
  25. include(${wxWidgets_USE_FILE})
  26. add_include_directories(include)
  27. -add_references(xtd.drawing xtd.forms.native ${wxWidgets_LIBRARIES} ${XTD_EXTRA_LIBS})
  28. +add_references(xtd.drawing xtd.forms.native)
  29. add_sources(
  30. include/xtd/xtd.forms.native.wxwidgets.h
  31. include/xtd/xtd.forms.native.wxwidgets
  32. diff --git a/src/xtd.forms/include/xtd/forms/button_renderer.h b/src/xtd.forms/include/xtd/forms/button_renderer.h
  33. index 2bfe757..bca4d9b 100644
  34. --- a/src/xtd.forms/include/xtd/forms/button_renderer.h
  35. +++ b/src/xtd.forms/include/xtd/forms/button_renderer.h
  36. @@ -4,6 +4,7 @@
  37. #pragma once
  38. #include <optional>
  39. #include <string>
  40. +#include <cstddef>
  41. #include <xtd/drawing/color.h>
  42. #include <xtd/drawing/font.h>
  43. #include <xtd/drawing/graphics.h>
  44. diff --git a/src/xtd.tunit/CMakeLists.txt b/src/xtd.tunit/CMakeLists.txt
  45. index 651e875..4a2891a 100644
  46. --- a/src/xtd.tunit/CMakeLists.txt
  47. +++ b/src/xtd.tunit/CMakeLists.txt
  48. @@ -4,6 +4,15 @@ cmake_minimum_required(VERSION 3.20)
  49. project(xtd.tunit)
  50. include(../../scripts/cmake/xtd_commands.cmake)
  51. include(../../scripts/cmake/xtd_version.cmake)
  52. +
  53. +find_package(PkgConfig)
  54. +pkg_check_modules(GSOUND REQUIRED gsound)
  55. +include_directories(${GSOUND_INCLUDE_DIRS})
  56. +link_directories(${GSOUND_LIBRARY_DIRS})
  57. +set(XTD_EXTRA_LIBS "${XTD_EXTRA_LIBS};${GSOUND_LIBRARIES}")
  58. +
  59. +add_references(${XTD_EXTRA_LIBS})
  60. +
  61. add_include_directories(include)
  62. add_references(xtd.core)
  63. add_sources(
  64. diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
  65. index f993971..9b1d9c8 100644
  66. --- a/tools/CMakeLists.txt
  67. +++ b/tools/CMakeLists.txt
  68. @@ -5,6 +5,18 @@ project(tools)
  69. include(../scripts/cmake/xtd_commands.cmake)
  70. include(../scripts/cmake/xtd_version.cmake)
  71. +find_package(PkgConfig)
  72. +pkg_check_modules(WXWIDGETS wxwidgets)
  73. +include_directories(${WXWIDGETS_INCLUDE_DIRS})
  74. +link_directories(${WXWIDGETS_LIBRARY_DIRS})
  75. +set(XTD_EXTRA_LIBS ${WXWIDGETS_LIBRARIES})
  76. +
  77. +pkg_check_modules(GSOUND REQUIRED gsound)
  78. +include_directories(${GSOUND_INCLUDE_DIRS})
  79. +link_directories(${GSOUND_LIBRARY_DIRS})
  80. +set(XTD_EXTRA_LIBS "${XTD_EXTRA_LIBS};${GSOUND_LIBRARIES}")
  81. +add_references(${XTD_EXTRA_LIBS})
  82. +
  83. # Add projects
  84. if (XTD_BUILD_TOOL_GUIDGEN_COMMAND_LINE)
  85. add_projects(guidgen)