795e78685f
Merge pull request #13187 from OatmealDome/flatpak-appinfo
...
Flatpak: Use ScmRevGen to generate metainfo XML
2025-01-17 17:47:10 -05:00
93fc5c02ac
Merge pull request #13179 from TellowKrinkle/ForceSystemLib
...
CMake: Optional system library fixes
2025-01-10 04:56:08 +01:00
4fc259710f
Flatpak: Use ScmRevGen to generate metainfo XML
2025-01-07 02:35:14 -05:00
e05b033dd2
ScmRevGen: Don't generate Info.plist files directly
...
Some generators (like Unix Makefiles and Xcode) copy an app's Info.plist at configure time.
This causes a problem when we need to generate the Info.plist at build time, like how we
currently do it with ScmRevGen. Instead of generating the Info.plist directly in ScmRevGen,
provide an Info.plist without any version information to CMake at configure time, have
ScmRevGen generate a separate plist file with the version information at build time, and
then merge the two together to create the final Info.plist.
2024-12-05 14:56:08 -05:00
992b4ea930
ScmRevGen: Bump major version to 2412
2024-12-01 18:00:52 -05:00
613c959bda
CMake: Pass RESOLVED_USE_SYSTEM_<lib> as a parameter
...
Because we were setting it with a scope, it wasn't making its way into called functions that would try to inspect it. Now it does.
2024-11-06 21:47:10 -06:00
432d4a2a06
CMake: Properly abort when requested system lib is missing
2024-11-06 21:30:29 -06:00
3c4d4fcd09
ScmRevGen: Bump major version to 2409
2024-09-04 00:43:45 -04:00
4fa78be3ad
DolphinPostprocessBundle: Separate "-D" from DOLPHIN_BUNDLE_PATH definition
...
For whatever reason, the previous way would inject backslashes into any path that has spaces.
2024-08-01 22:06:55 -04:00
b0ca5f2666
DolphinPostprocessBundle: Use TARGET_BUNDLE_DIR to avoid having to make a relative path absolute
2024-08-01 22:06:55 -04:00
b92e354389
ScmRevGen: Bump major version to 2407
2024-07-02 02:36:16 -04:00
1ad982f469
ScmRevGen: Silence output on the standard error when getting the current tag
2024-06-30 16:55:47 -04:00
35f383d9b0
ScmRevGen: Set commits ahead to zero when on a tag
2024-06-29 22:59:40 -04:00
a1c54063d0
CMake: CCache: Always make clang happy
...
When we are using ccache anyway, always add the flags to make clang
happy. Also, fix copy-paste error regarding what variable to modify for
it.
2024-06-10 23:44:46 +02:00
f91413db8f
CMake: Fix CCache support when already using _LAUNCHER
...
The official ccache documentation[1] recommends to set
`CMAKE_C(XX)_COMPILER_LAUNCHER` to ccache to enable ccache.
These also work as envionment variables (supported by CMake itself).
However, using these instructions generates the following error during
building:
ccache: error: Recursive invocation (the name of the ccache binary must be "ccache")
This is because Dolphin adds an additional command ccache layer (ccache
ccache compiler ...).
This fixes that issue by checking for `CMAKE_C(XX)_COMPILER_LAUNCHER`
before inserting our own. Also, use `CMAKE_C(XX)_COMPILER_LAUNCHER`
to add ccache because the CMake docs discourages the use of
`RULE_LAUNCH_COMPILE` in favour of `CMAKE_C(XX)_COMPILER_LAUNCHER`.
[1]: https://github.com/ccache/ccache/wiki/CMake
2024-06-08 16:05:14 +02:00
c3e0aeb184
Merge pull request #12728 from OatmealDome/mac-version-numbers-2
...
ScmRevGen: Generate Info.plist files containing the current version
2024-05-30 01:13:32 -04:00
cd25e91ca2
use pkg_search_module to find minizip-ng or minizip
...
OpenBSD calls minizip-ng's .pc file minizip.pc
Others call minizip-ng's .pc file minizip-ng.pc
2024-05-07 04:25:04 +00:00
c154134e28
ScmRevGen: Generate Info.plist for MacUpdater
2024-04-21 13:28:21 -04:00
3ad1037d7f
ScmRevGen: Generate Info.plist for DolphinQt
2024-04-21 13:28:21 -04:00
1cb6ce6057
ScmRevGen: Refactor file configuration into a function
2024-04-21 13:28:18 -04:00
02f57a4778
Replace SCM_IS_MASTER with SCM_COMMITS_AHEAD_MASTER
2024-03-23 16:48:52 -05:00
25833cfd62
CMake: Hide warnings in Externals also for non-msvc.
2024-03-19 01:12:52 -05:00
fa81006b51
Merge pull request #11955 from TellowKrinkle/CMakeDependencies
...
CMake: Allow ignoring system packages
2023-06-30 19:06:04 +02:00
2a6f4d879c
CMake: Generate scmrev.h at build time instead of configure time.
2023-06-29 03:23:31 +02:00
ade40650f5
CMake: Support using bundled libraries even if system libraries exist
2023-06-15 01:41:41 -05:00
5b10a80401
CMake: Use targets for all optionally-external dependencies
2023-06-15 01:41:41 -05:00
1a0a1e8f12
Merge pull request #10976 from TellowKrinkle/StackFrames
...
Improve stack frames for profilers
2023-06-12 05:00:08 +02:00
2a9616d0a2
Fix lingering CMAKE_REQUIRED_INCLUDES variable from FindMBEDTLS, this breaks any further can-compile checks.
2023-06-06 19:09:31 +02:00
4d61ec1f4f
CMake: Fix build with system Mbed TLS
2023-05-26 01:59:51 +00:00
86f1ef1e33
Merge pull request #11707 from TellowKrinkle/CMakeIconv
...
CMake: Use find_package and imported targets for Iconv
2023-05-19 19:27:16 +02:00
eb6bf08170
CMake: Add custom FindIconv
...
Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/24695
2023-04-08 21:43:03 -05:00
0d4a5274f1
CMake: Remove custom SDL2 find script
...
It doesn't properly set the include paths for macos framework builds of SDL, and SDL has had its own find script since 2.0.10
2023-03-30 21:17:10 -05:00
6aafbaf66f
Fix build when using mGBA in unorthodox location
...
Includes use `mgba/` and `mgba-util/` as part of path, making compilation fail when relying on include directory supplied here was actually needed.
2023-02-14 22:24:02 +03:00
1eb69ea0a0
Merge pull request #10936 from TellowKrinkle/FixIncludeDirs
...
CMake: Actually use the include directories specified by dependencies
2023-01-30 09:19:06 +01:00
afde3a0e0d
try for system libmgba first
2022-12-22 19:18:07 +01:00
717c36bc43
WinUpdater: Check OS and VC++ Redist versions.
2022-09-20 15:57:50 -07:00
1bc133f3ae
CMake: Properly include lzma include directories
2022-08-18 21:06:57 -05:00
048f6fac52
CMake: Properly include zstd include directories
2022-08-18 21:06:57 -05:00
b5da4e9d48
CMake: Don't omit frame pointer on RelWithDebInfo builds
2022-08-10 23:48:56 -05:00
6ea7af13e8
cmake: Disable warnings for most externals on MSVC, like we do in the VS project files.
2022-05-22 00:30:56 +02:00
a5e85627b0
cmake: Use Policy CMP0117 for more sensible RTTI flag configuration on MSVC.
2022-05-22 00:30:56 +02:00
d8a5a8827e
Externals: Update mbedtls to 2.28.0
2022-04-02 19:30:22 -04:00
d0484a9ea9
CMake: Fix MSVC flags for Release/RelWithDebInfo
...
See https://gitlab.kitware.com/cmake/cmake/-/issues/20812
Manually redefine MSVC flags to match Visual Studio defaults
and ensure that Release builds generate debug info.
2021-04-27 12:54:18 +02:00
6910fab63f
cmake: Replace /Zi with /Z7 for sccache support
...
Also allows better parallelization since there's no contention on a PDB
file with compiling.
2021-04-24 17:59:34 +02:00
712b078a5b
cmake: Search for sccache too in CCache module
...
sccache is a ccache rewrite that supports GCC, Clang and MSVC.
2021-04-24 17:59:34 +02:00
439e2e3fc2
Stricter test for compiler flags
...
Some flags do nothing but generate dozens of warnings later,
add '-Werror' during testing to catch those early.
Main culprit is '-fvisibility-inlines-hidden' which is invalid for C files
2021-02-22 10:47:12 +01:00
2bfbc4d79f
cmake: Silence warnings.
2020-09-08 21:18:40 -07:00
143131a6a1
cmake: add an option to control dependencies vendoring
...
Disable by default, to be used by distributions who care to try and
prefer system-wide libraries when available. It makes sense for us to
keep using vendored libs by default when possible to make it easier for
users to compile, but we should provide appropriate tools for distro to
figure out which dependencies they can share with the rest of the
system.
2020-05-10 09:34:14 +02:00
f04f5fe930
Match path type to BundleUtilities when running fixup_bundle
...
BundleUtilities uses `ABSOLUTE`, and if you use `REALPATH` (which removes symlinks) and compile from a path that contains symlinks, BundleUtilities will complain about things not being inside the main app bundle because some paths don't match
2020-03-29 20:04:03 -05:00
c95802afeb
CMake: Make X11 and EGL optional
2018-10-20 21:11:34 +10:00
OatmealDome