fly/flightgear
1
0
Fork 0
Code Activity
14881 commits 1 branch 0 tags 41 MiB
Commit graph

175 commits

Author SHA1 Message Date
legoboyvdlp R
6512783996 SetupSwiftLibraries.cmake requires a global variable libEvent_target. However, while the PKGConfig variant of FindLibEvent.cmake did set this, the Win32 variant did not; therefore CMake would always fail to find libEvent, disabling Swift. Therefore I set this property, restoring proper compilation of Swift on Windows systems. 2020-10-29 21:29:13 +00:00
James Turner
992bb81c0f Remove debug output from this file. 2020-10-23 15:40:33 +01:00
James Turner
329d3cdd13 PLIB includes fix from Florent 2020-09-29 12:30:34 +01:00
James Turner
22bad9db33 Fix for CMake/system libSGM issue: consistent path 
Our copy of libGSM, and a system-wide version have different include
suffixes, so adjust the FindGsm.cmake so that the returned include-path
is consistent with our internal version.

See discussion in:https://sourceforge.net/p/flightgear/codetickets/2368/
 2020-09-03 19:18:57 +01:00
James Turner
740193a378 CMake: different fix for ALIAS issues with 3.10 
ALIAS is not really functional in 3.10, so use a variable to approximate
the same behaviour. Not elegant but it seems to work.
 2020-08-27 22:33:08 +01:00
James Turner
5dbab6e90e CMake: overhaul how we find 3rd-party files 
Handle the standard windows-3rd-party setup (used by fgmeta) with no
extra options, and also handle the slightly odd setup we use on Jenkins.
Try to tolerate all permutations of setting MSVC_3RDPARTY_ROOT to 
different places in the hierarchy.

We no longer try to guess Boost_INCLUDEDIR by looking at parent dirs of
MSVC_3RDPARTY_ROOT, since this seemed kind of bad to me. Let’s try 
it and see.
 2020-08-26 13:57:24 +01:00
James Turner
cf424e4344 Rename buildId header file 
Avoid the very common name ‘build.h’ in favour of something clearer
and FlightGear specific.
 2020-08-24 15:05:16 +01:00
Erik Hofman
c6182af080 Consistent naming 2020-08-24 11:00:05 +02:00
Erik Hofman
49b13372f4 Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/flightgear into next 2020-08-24 08:17:13 +02:00
James Turner
a82a13b70c Cmake: fix compat with CMake 3.10 
Thankfully StackOverflow had an evil solution to this missing feature
in 3.10.
 2020-08-23 22:25:03 +01:00
James Turner
95fd692af1 CMake: move install() rule for compatability 
Older CMake versions can’t install(TARGET…) from a different directory.
 2020-08-23 21:50:36 +01:00
Erik Hofman
be1764a995 XMerge branch 'next' of ssh://git.code.sf.net/p/flightgear/flightgear into next 2020-08-23 19:22:47 +02:00
Erik Hofman
00c32f5408 Display that AeonWave is being found, even when cached 2020-08-23 19:22:25 +02:00
James Turner
fef50310bf Cmake: fix some issues Scott spotted. 2020-08-23 18:15:07 +01:00
James Turner
87a7221051 Linux Cmake fixes 2020-08-23 11:31:37 +01:00
James Turner
f7dc02d009 Fix Swift build with CMake 2020-08-23 11:31:37 +01:00
James Turner
e4e2b34a4c FGCom OpenAL CMake fixes 
Ensure we detect OpenAL the way IAXClient expects, and set it up as
a dependency of IAXClient, not FGCom.
 2020-08-23 11:31:37 +01:00
James Turner
218df89b29 Embedded resources: better cmake command 
Use add_custom_command and an intermediate OBJECT library to avoid
rerunning fgrcc unless the XML input file has actually changed.
 2020-08-23 11:31:37 +01:00
James Turner
eb55f25997 Newer FindGit 2020-08-23 11:31:37 +01:00
James Turner
47ff3e9f67 Improve CMake strucutre 2020-08-23 11:31:37 +01:00
James Turner
22ed65bbb8 Cmake: FindCURL with imported target support 2020-06-25 09:39:26 +01:00
Lars Toenning
b280905b8c Fix CMake 5.17+ FPHSA warning 
Starting with CMake 5.17 FindPackageHandleStandardArgs is detecting package name mismatches. Also capitalization is checked. 
See: ee4673c1ae
 2020-06-16 12:09:39 +01:00
James Turner
37936496a4 CMake translations: don’t break no-translation builds 
Move all the relevant pieces inside the do_translate guard, so we
don’t break compilation when translation is disabled.
 2020-05-13 23:35:53 +01:00
James Turner
3dc3d4399a Cmake: detect required translations automatically 
This avoids needs to manually keep this file in sync with the actual
available translation dirs.
 2020-05-13 15:01:50 +01:00
James Turner
05d455debc Fix build issue when a translation file is missing 
Only try to build XLF files we actually found in the source dir.
 2020-05-12 13:36:28 +01:00
James Turner
b52d41b0c3 Allow region/local specifications of translations 2020-05-08 14:54:53 +01:00
James Turner
fe3a27450f Fix DBus detection for Cmake < 3.6 
From Saikrishan Arcot
 2020-04-27 14:21:47 +01:00
James Turner
faee5dbabf Code changes for crash reporting with Sentry. 2020-04-17 17:55:34 +01:00
James Turner
a46a73459f Launcher: add Catalan, Slovak to languages 2020-04-16 11:14:14 +01:00
James Turner
2500534b1e Build changes for new crash-reporting system. 2020-04-07 09:38:13 +01:00
gallaert
1ce36af298 - When HLA is enabled in Simgear, HLA is also enabled in Flightgear 
making the build between Simgear and Flightgear consistent.
- Fix an issue with lib/lib64 path between CentOS/RedHat distributions
  and Debian derived distributions.
- Fix a compilation issue with HLA in the Flightgear code.
 2020-04-01 21:02:24 +01:00
James Turner
7e9930e871 Move fnt code from PLIB into 3rdparty 
This enables us to fix TXF loading to use UTF8 paths, required for
handling non-ASCII paths on Windows.
 2020-03-13 12:21:56 +00:00
James Turner
d0c12149c3 Fixes to translation updating: use correct path. 2020-03-10 17:29:33 +00:00
James Turner
ecb48062ef Add CMake target to update Launcher translations 
Invoke ‘make ts’ (or equivalent for your build system) to update the
.XLF files for the launcher.
 2020-03-10 17:25:03 +00:00
Scott Giese
a9365cd34e Embedded Resources: Fix for Ninja 1.9 
Refactor to break circular references.
New custom target generates the resource files.
FGFS and Test_Suite targets declare a dependency to the generated files.
 2019-12-26 01:26:44 -06:00
Scott Giese
634ca9c31f typo 2019-12-15 11:40:00 -06:00
Julian Smith
f3d1135320 Various fixes for building on OpenBSD. 2019-09-04 10:55:43 +01:00
James Turner
309aaa794f Flite always compiled now. 2019-06-03 16:51:08 +01:00
James Turner
db8985fc76 Fix a typo on Windows 2019-05-27 17:47:24 +01:00
James Turner
7738f33306 Adjust FindDBus to use imported targets 
This is necessary on macOS where DBus is typically installed using
Homebrew, and hence we need additional linker flags to find the
library. Using the PkgConfig::DBUS imported target handles all this
transparently, but then we need to define an imported target for
Windows to work.
 2019-05-27 11:37:35 +01:00
Lars Toenning
5a662d97fd Fix broken libevent/dbus cmake module 2019-05-17 10:19:38 +02:00
Florent Rougon
63f6d0b5bf Convert obsolete uses of get_filename_component(<var> <FileName> PATH) 
In the context of get_filename_component(), PATH is a legacy alias for
DIRECTORY. Replace it with DIRECTORY, which is recommended[1] for
CMake versions > 2.8.11.

[1] https://cmake.org/cmake/help/latest/command/get_filename_component.html
 2019-04-25 19:11:01 +02:00
Florent Rougon
b2d6acdd4d CMake changes related to FGDATA_SRC_DIR and TRANSLATIONS_SRC_DIR 
- When FGDATA_SRC_DIR isn't explicitly set by the user, set it to
  ${PROJECT_SOURCE_DIR}/../fgdata if this is a directory.

- When TRANSLATIONS_SRC_DIR isn't explicitly set by the user, look for
  translations in ${FGDATA_SRC_DIR}/Translations instead of
  ${PROJECT_SOURCE_DIR}/../fgdata/Translations (i.e., honor the setting
  of FGDATA_SRC_DIR for the sake of translation lookup).

This fixes the problem explained in [1] and [2].

[1] https://sourceforge.net/p/flightgear/mailman/message/36645499/
[2] b2274fbbed/
 2019-04-25 19:11:01 +02:00
Lars Toenning
85acefab95 Swift: initial support 2019-04-11 11:36:22 +01:00
James Turner
2b1913e118 Add Russian to list of Qt translations to sync 2018-10-12 11:37:08 +01:00
James Turner
ca8b84dae0 Make translations detection more robust 
Thanks to Scott Giese for the suggestion, check for a full valid
path inside the Translation setup, in case FGData exists but is not
populated.
 2018-09-22 18:24:23 +01:00
Stuart Buchanan
c5840b1039 Fix translations variable where no translations data 2018-09-01 16:22:08 +01:00
James Turner
c537bbcfe7 Translations: detect missing lrelease explicitly. 
This gives a clearer message and behaviour when Qt is installed but
the translation tools have been omitted.
 2018-09-01 14:59:24 +01:00
James Turner
41687767b9 Translations looked up correctly 
Tweak both the launcher and main locale lookups, to tolerate the
different region suffixes encountered in reality.
 2018-08-28 23:34:44 +01:00
James Turner
2329654e3b Disabling translations is tricky. 2018-08-28 17:12:31 +01:00