Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,812 Commits 1 Branch 330 Tags
67d9eb2541bcd8dcad1f47d012778ffbb06bd9c0
Commit Graph

353 Commits

Author SHA1 Message Date
CPUBug
67d9eb2541 Fix wxNet build problem when cross-compiling using CMake 
Fix the case of "winhttp" library, this is important when using
case-sensitive file systems.

Closes https://github.com/wxWidgets/wxWidgets/pull/2409
 2021-07-03 14:24:20 +01:00
Maarten Bent
cd9a35b997 CMake: generate build.cfg 2021-06-18 00:41:45 +02:00
Maarten Bent
980bba88aa CMake: Use .a suffix for import libraries 
So it will have the same extension as the libraries created by makefile.gcc.
 2021-06-17 23:16:03 +02:00
Maarten Bent
6f34937993 CMake: Improve webkit plugin name 2021-06-06 23:38:38 +02:00
Maarten Bent
979a4b5237 CMake: Improve wxrc name 
Include the version and flavour in the target name, no need to rename anymore.
Add the wxrc symlink to extra uninstall files, not the actual target name.
 2021-06-06 23:38:38 +02:00
Maarten Bent
3e0057757b CMake: Use a macro to get the flavour 
Also include the flavour in builtin target names and include path.
 2021-06-06 23:38:38 +02:00
Maarten Bent
91884752c1 CMake: Create symlinks with so version 2021-06-06 23:36:59 +02:00
Maarten Bent
f830bde25b CMake: Improve library names 
Use the same output names as MSVC and makefile.gcc/vc on Windows, and the same as configure on other platforms.
 2021-06-06 23:36:59 +02:00
Pedro Vicente
26795b7432 Use C++11 by default in CMake build under macOS 
Force the use of C++11 standard on macOS to avoid C++11 specific
warnings with clang.

Closes https://github.com/wxWidgets/wxWidgets/pull/2374
 2021-05-22 21:30:10 +01:00
cnbatch
94b399418c Fix an issue that MSVC 2019 cannot compile with CMake 
Fix using PCH with MSVC too, which notably fixes using it with vcpkg.

Closes https://github.com/wxWidgets/wxWidgets/pull/2372

Co-Authored-By: Maarten Bent <MaartenBent@users.noreply.github.com>
 2021-05-19 19:48:04 +02:00
Maarten Bent
750bf01fe6 CMake: don't include libc.so in wx-config 
Closes https://github.com/wxWidgets/wxWidgets/pull/2364
 2021-05-16 22:43:50 +02:00
konstantin.matveyev
26671c944c config.cmake tweak for macOS: .tbd extension added 2021-05-11 11:48:08 +03:00
Konstantin S. Matveyev
edc82ffce4 config.cmake fix for macOS 2021-05-09 17:01:00 +03:00
Maarten Bent
9814d58415 CMake: Improve adding external libraries to wx-config 
Don't add -l to libraries already containing it (for example -lpthread).
Change libraries with format libName.so or libName.a to -lName,
configure also uses -l for these libraries. Account for possible invalid
libraries (Name-NOTFOUND) which could happen with imported libraries,
for example OpenGL::OpenGL.

Closes https://github.com/wxWidgets/wxWidgets/pull/2359
 2021-05-09 00:29:29 +02:00
Vadim Zeitlin
c8c55be4ab Merge branch 'cmake-wxconfig' of https://github.com/MaartenBent/wxWidgets 
Fix wx-config generation in CMake build.

See https://github.com/wxWidgets/wxWidgets/pull/2353

Closes #19164.
 2021-05-01 14:10:21 +02:00
Tomay
0e39566b3a Add wxImage Change{Saturation,Brightness,HSV,Lightness}() 
Add more functions for manipulating wxImage colours.

Show using them in the same and add new unit tests for them.

This is a squashed commit of branch 'tomay3000/image-lightness'.

Closes https://github.com/wxWidgets/wxWidgets/pull/2310
 2021-05-01 14:03:04 +02:00
Maarten Bent
e000f0d1a8 CMake: add '-l' prefix to all library dependencies 2021-04-29 21:48:29 +02:00
Maarten Bent
dd274289bd CMake: don't define WXUSINGDLL in wx-config for static library 2021-04-29 21:48:29 +02:00
Vadim Zeitlin
1dfc18a004 Link with ws2_32.lib rather than obsolete wsock32.lib 
Winsock 2 provided by ws2_32.lib is available since 1994, it should be
fine to use it even for wx in 2021.

See #15562.
 2021-04-18 22:13:45 +02:00
Maarten Bent
c968e49b13 CMake: Remove iOS workaround 
Not needed anymore since the fix in 60c620c28c.

Closes https://github.com/wxWidgets/wxWidgets/pull/2308
 2021-04-06 11:41:06 +02:00
tamasmeszaros
60c620c28c Fix libraries names when cross compiling on Linux using CMake 
This allows using wxWidgets libraries from CMake when cross-compiling
too.

Closes https://github.com/wxWidgets/wxWidgets/pull/2291
 2021-04-04 17:06:45 +02:00
Stefan Csomor
5452d7235e adding missing framwork to CMake 2021-04-03 22:32:34 +02:00
Vadim Zeitlin
e442d90b0d Merge branch 'webrequest-build-fixes' of https://github.com/MaartenBent/wxWidgets 
wxWebRequest-related build fixes for MinGW.

See https://github.com/wxWidgets/wxWidgets/pull/2283
 2021-03-23 14:16:07 +01:00
Maarten Bent
3cc48e2e56 Fix checking __MINGW64_VERSION_MAJOR for wxUSE_WEBREQUEST_WINHTTP 
It is not yet defined for setup.h, so check it in chkconf.h.
Fixes #19105
 2021-03-23 00:39:16 +01:00
Vadim Zeitlin
1cdf59ff92 Remove "basic STL functionality" configure and CMake checks 
This check didn't work in configure when using C++17 or later, as
std::bind2nd() is removed in C++17 and so was worse than useless as it
actually prevented --enable-stl from working.

And while it was only done when using C++98 in CMake, it still seems
pretty useless there too as there should be no environments in which
basic stuff like std::vector<> or std::find_if() is not available.

So just remove it entirely.
 2021-03-22 18:38:10 +01:00
Tobias Taschner
c69193d3da CMake: enable more warnings for GCC/Clang 
Enable the same warnings for GCC and Clang as are
enabled with a configure build
 2021-03-17 12:58:17 +01:00
Stefan Csomor
d1efcc374b Adding GLKit to console and cmake builds 2021-03-15 14:09:07 +01:00
Vadim Zeitlin
2551df746d Merge branch 'cmake-mono-webview' of https://github.com/MaartenBent/wxWidgets 
CMake: fix monolithic build with webview.

See https://github.com/wxWidgets/wxWidgets/pull/2269
 2021-03-09 21:44:27 +01:00
Maarten Bent
0bb9cd004d CMake: copy webview2 loader for monolithic build 2021-03-08 00:26:24 +01:00
Maarten Bent
3198ed0b18 CMake: reset webview2 package dir if it does not exist anymore 
And make the variable internal so it does not create an 'Ungrouped Entries' group in cmake-gui.
 2021-03-07 22:06:46 +01:00
Maarten Bent
560656c699 CMake: do not use target webview in monolithic build 2021-03-07 22:06:46 +01:00
Vadim Zeitlin
39a46db345 Merge branch 'gtk-x-checks-simplify' 
Simplify X11 checks and make them work when using Wayland-only GTK.

See https://github.com/wxWidgets/wxWidgets/pull/2261
 2021-03-05 18:52:23 +01:00
Vadim Zeitlin
9a84e0b25e Don't require X11 in CMake builds using Wayland-only GTK 
X11 headers and libraries are only required if we're actually using X11
which may not be the case.

This allows to build wxGTK on the systems using Wayland-only GTK.
 2021-03-01 13:32:57 +01:00
Maarten Bent
272c903234 Silence unknown pragmas warning in the WebView2 header 
Using wxGCC_WARNING_SUPPRESS(unknown-pragmas) around the webview2 header does
not work, so suppress it for the entire webview project.
 2021-03-01 00:09:23 +01:00
Maarten Bent
09bc566b60 Support building wxWebViewEdge with GCC or Clang 
Add EventToken.h with EventRegistrationToken implementation, that can be used by the WebView2 header.
 2021-03-01 00:09:23 +01:00
Tobias Taschner
1ee05c54ed CMake: Download SDK when wxUSE_WEBVIEW_EDGE=ON 
Automatically download the WebView2 SDK from nuget (official repo for the SDK)
when enabling wxUSE_WEBVIEW_EDGE to simplify usage.
Copying to 3rdparty/webview2 is still supported optionally.
 2021-02-08 21:29:08 +01:00
Maarten Bent
b3b5cde7f5 CMake: Mark some build options as advanced 2021-02-07 20:34:42 +01:00
Maarten Bent
9585e08365 CMake: Add benchmarks 
Put each benchmark application in a sub-directory instead of specifying all in one
file, because cotire cannot create PCH targets for the same file twice (bench.cpp).
 2021-02-07 20:34:42 +01:00
Maarten Bent
7b79423470 CMake: Add argument to specify console app that uses gui libraries 2021-02-07 20:11:56 +01:00
Artur Wieczorek
e73cb85246 Add tests of wxGraphicsBitmap 2021-02-05 23:52:29 +01:00
Maarten Bent
c8a71bc631 CMake: Enable wxUSE_WEBVIEW_EDGE when WebView2 SDK is detected 
Only for MSVC >1800 (Visual Studio 2017, vc140) and later.
 2021-01-19 22:43:09 +01:00
Maarten Bent
6dfb96c075 CMake: Use build directory as ctest working directory 
Use existing variable for VS working directory.
 2021-01-19 19:58:46 +01:00
Maarten Bent
226a3de596 CMake: Use common function for adding samples, tests and demos 2021-01-19 19:58:46 +01:00
Vadim Zeitlin
febd185fc6 Merge branch 'web-request' 
Add wxWebViewRequest and related classes allowing to use HTTPS and
HTTP/2.

See https://github.com/wxWidgets/wxWidgets/pull/977
 2021-01-17 18:19:47 +01:00
Vadim Zeitlin
717e6590bd Merge branch 'macos_wkwebview' of https://github.com/TcT2k/wxWidgets 
Use WKWebView for wxWebView Implementation under Apple systems.

See https://github.com/wxWidgets/wxWidgets/pull/2113
 2021-01-16 16:20:58 +01:00
Artur Wieczorek
1527927643 Add new wxImageList test files to CMake 2021-01-13 09:03:04 +01:00
Vadim Zeitlin
a2a409f7a5 Remove references to non-existent wxWebRequest headers 
Remove the platform-specific wxWebRequest headers from the files lists
and from MSVS 200x project files.

This should have been done in e5bd5a926c (Move backend-specific
wxWebRequest headers to private subdirs, 2020-12-26) manually, as
update-setup-h script doesn't remove the old files from the variable
definitions.

It notably fixes CMake build under MSW and Mac, which failed due to not
finding the referenced files.
 2020-12-30 14:36:06 +01:00
Vadim Zeitlin
7b6c4cb9e9 Include required module before using check_c_source_compiles() 
Fix CMake build with 3.10, which gave the following errors

CMake Error at build/cmake/init.cmake:321 (check_c_source_compiles):
  Unknown CMake command "check_c_source_compiles".
Call Stack (most recent call first):
  build/cmake/main.cmake:16 (include)
  CMakeLists.txt:69 (include)

previously. Apparently the required CheckCSourceCompiles module was
already included from somewhere else with later CMake versions, but not
with this one, so do include it explicitly.
 2020-12-30 14:26:06 +01:00
Vadim Zeitlin
e5bd5a926c Move backend-specific wxWebRequest headers to private subdirs 
There is no need to make these headers public and keeping them private
will allow making backwards-incompatible changes to them in the future.
 2020-12-26 17:00:07 +01:00
Maarten Bent
13d0e0a152 Fix linking with libcurl under MSW when using CMake 
Enable CMP0060 policy to use full path for the library.
 2020-12-26 15:56:56 +01:00