cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,723 Commits 1 Branch 0 Tags 333 MiB
3e0057757b
Commit Graph

21 Commits

Author SHA1 Message Date
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
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
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
Thomas Khyn
d9deaa8b76 Allow CMake dependencies to be interfaces 
In some cases (see https://github.com/bincrafters/community/issues/1181),
the dependencies can be library interfaces.

As CMake's get_target_property is not tolerant about what properties can
be extracted on different library types, it is necessary to make a
distinction between interface libraries and plain libraries.

Closes https://github.com/wxWidgets/wxWidgets/pull/2058
 2020-09-29 03:27:38 +02:00
Maarten Bent
21e92cbcf1 CMake: don't add cross compile suffix to wx-config library names for iOS build 
The libraries do not have this suffix. And configure also doesn't do it.
 2020-06-18 20:28:54 +02:00
Maarten Bent
0f806ad96d CMake: use wx prefix in library names 
Rename all library targets to start with wx. This way it does not use generic
names like base or core that could interfere with other libraries that add
include the wxWidgets project.
 2020-05-17 20:01:02 +02:00
NikitaFeodonit
537564ae19 CMake: use the target property OUTPUT_NAME instead of LOCATION in wx_get_dependencies 2019-01-21 18:19:39 +03:00
NikitaFeodonit
1bc43c8d7a CMake: in wx_get_dependencies, for existing targets, use its LOCATION instead of the target name 2019-01-21 13:46:24 +03:00
Maarten Bent
8555f4abb0 CMake: Fix wx-config library list with monolithic build 
Closes https://github.com/wxWidgets/wxWidgets/pull/1132
 2019-01-11 14:29:26 +01:00
Jeff Bland
2937369869 CMake: Fix monolithic build 
Monolithic build regressed with commit
815d288c4fedba044a9863c883d6dd9f53526668 "Set wx-config base, gui and
built libraries".

The code queries each possible target name and creates lists of the
valid targets. In the monolithic build, none of the normal target names
exist, so the list is empty. The empty list is then passed to STRIP,
causing cmake to fail due to not having enough arguments.

By quoting the STRIP params we can pass an empty argument and thus
prevent the error of not-enough arguments.

See https://github.com/wxWidgets/wxWidgets/pull/1100
 2018-12-25 18:50:06 +01:00
Maarten Bent
c28ae123c1 CMake: Set wx-config extra libraries and flags 2018-12-06 22:48:03 +01:00
Maarten Bent
12ed604cb3 CMake: Set wx-config name variables 2018-12-06 22:39:42 +01:00
Maarten Bent
33a550d97f CMake: Set wx-config base, gui and built libraries 
Remove unused propagated variables.
 2018-12-06 22:39:41 +01:00
Maarten Bent
bc4b56bf88 CMake: Reorder items in config.cmake 
Group similar items together.
 2018-12-06 22:39:41 +01:00
Maarten Bent
8192d507e3 CMake: Fix wx-config include dirs 2018-12-02 17:45:43 +01:00
Maarten Bent
e1b725d5be CMake: mark package variables as advanced 
Silence pkg_check_modules message.
 2018-11-04 16:35:58 +01:00
Tobias Taschner
da2b8ea812
Add CMake build system 
Add CMake build system for libraries, tests and samples
update_files.py converts build/files into CMake format.
build/update-setup-h has been modified to update build/cmake/setup.h.in.
 2017-01-03 20:53:10 +01:00