123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687 |
- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
- index a01d814..595190c 100644
- --- a/src/CMakeLists.txt
- +++ b/src/CMakeLists.txt
- @@ -5,6 +5,14 @@ project(src)
- include(../scripts/cmake/xtd_commands.cmake)
- include(../scripts/cmake/xtd_version.cmake)
-
- +find_package(PkgConfig)
- +pkg_check_modules(WXWIDGETS wxwidgets)
- +include_directories(${WXWIDGETS_INCLUDE_DIRS})
- +link_directories(${WXWIDGETS_LIBRARY_DIRS})
- +set(XTD_EXTRA_LIBS "${XTD_EXTRA_LIBS};${WXWIDGETS_LIBRARIES}")
- +
- +add_references(${XTD_EXTRA_LIBS})
- +
- set(XTD_HEADER_FILE "xtd/include/xtd/xtd.h")
- file(WRITE ${XTD_HEADER_FILE}
- "// This code was generated by CMake script.\n"
- diff --git a/src/xtd.forms.native.wxwidgets/CMakeLists.txt b/src/xtd.forms.native.wxwidgets/CMakeLists.txt
- index 263a4ab..8d35497 100644
- --- a/src/xtd.forms.native.wxwidgets/CMakeLists.txt
- +++ b/src/xtd.forms.native.wxwidgets/CMakeLists.txt
- @@ -18,7 +18,7 @@ endif()
- find_package(wxWidgets REQUIRED COMPONENTS base core xrc)
- include(${wxWidgets_USE_FILE})
- add_include_directories(include)
- -add_references(xtd.drawing xtd.forms.native ${wxWidgets_LIBRARIES} ${XTD_EXTRA_LIBS})
- +add_references(xtd.drawing xtd.forms.native)
- add_sources(
- include/xtd/xtd.forms.native.wxwidgets.h
- include/xtd/xtd.forms.native.wxwidgets
- diff --git a/src/xtd.forms/include/xtd/forms/button_renderer.h b/src/xtd.forms/include/xtd/forms/button_renderer.h
- index 2bfe757..bca4d9b 100644
- --- a/src/xtd.forms/include/xtd/forms/button_renderer.h
- +++ b/src/xtd.forms/include/xtd/forms/button_renderer.h
- @@ -4,6 +4,7 @@
- #pragma once
- #include <optional>
- #include <string>
- +#include <cstddef>
- #include <xtd/drawing/color.h>
- #include <xtd/drawing/font.h>
- #include <xtd/drawing/graphics.h>
- diff --git a/src/xtd.tunit/CMakeLists.txt b/src/xtd.tunit/CMakeLists.txt
- index 651e875..4a2891a 100644
- --- a/src/xtd.tunit/CMakeLists.txt
- +++ b/src/xtd.tunit/CMakeLists.txt
- @@ -4,6 +4,15 @@ cmake_minimum_required(VERSION 3.20)
- project(xtd.tunit)
- include(../../scripts/cmake/xtd_commands.cmake)
- include(../../scripts/cmake/xtd_version.cmake)
- +
- +find_package(PkgConfig)
- +pkg_check_modules(GSOUND REQUIRED gsound)
- +include_directories(${GSOUND_INCLUDE_DIRS})
- +link_directories(${GSOUND_LIBRARY_DIRS})
- +set(XTD_EXTRA_LIBS "${XTD_EXTRA_LIBS};${GSOUND_LIBRARIES}")
- +
- +add_references(${XTD_EXTRA_LIBS})
- +
- add_include_directories(include)
- add_references(xtd.core)
- add_sources(
- diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
- index f993971..9b1d9c8 100644
- --- a/tools/CMakeLists.txt
- +++ b/tools/CMakeLists.txt
- @@ -5,6 +5,18 @@ project(tools)
- include(../scripts/cmake/xtd_commands.cmake)
- include(../scripts/cmake/xtd_version.cmake)
-
- +find_package(PkgConfig)
- +pkg_check_modules(WXWIDGETS wxwidgets)
- +include_directories(${WXWIDGETS_INCLUDE_DIRS})
- +link_directories(${WXWIDGETS_LIBRARY_DIRS})
- +set(XTD_EXTRA_LIBS ${WXWIDGETS_LIBRARIES})
- +
- +pkg_check_modules(GSOUND REQUIRED gsound)
- +include_directories(${GSOUND_INCLUDE_DIRS})
- +link_directories(${GSOUND_LIBRARY_DIRS})
- +set(XTD_EXTRA_LIBS "${XTD_EXTRA_LIBS};${GSOUND_LIBRARIES}")
- +add_references(${XTD_EXTRA_LIBS})
- +
- # Add projects
- if (XTD_BUILD_TOOL_GUIDGEN_COMMAND_LINE)
- add_projects(guidgen)
|