James Turner
0da1fc574d
VS2015 compatability fixes.
2016-06-01 22:58:03 +01:00
James Turner
3c5340d98d
Merge /u/edauvergne/flightgear/ branch fdm_restoration into next
...
http://sourceforge.net/p/flightgear/flightgear/merge-requests/24/
2015-12-10 22:35:07 +00:00
James Turner
5bf59d58c4
On Mac, force the macon-min-version value
...
- Workaround for CMAKE_OSX_DEPLOYMENT_TARGET not behaving as it’s
supposed to reliably.
2015-12-08 20:47:02 +00:00
Edward d'Auvergne
acea7c422b
Reactivated the UIUC, LaRCsim, and special purpose FDMs.
...
As the FlightGear distribution ships aircraft based on these FDMs with each
release, the shipped FlightGear executables should therefore be able to handle
these aircraft. For example the unique ornithopter can only be flown with the
UIUC FDM, hence it is available for download but will be non-functional for most
users.
This partly reverts commit e819a4aaa4
from Nov 1,
2011 which deactivated the compilation of these in the CMakeLists.txt file.
Signed-off-by: Edward d'Auvergne <edward@nmr-relax.com>
2015-12-05 14:56:42 +01:00
James Turner
2314ccfe13
Developer-warnings
...
- make some existing warnings developer-mode only
- add a warning about legacy aircraft path usage
2015-11-13 22:13:44 +00:00
James Turner
3e64e276d7
Remove OldGNUInstallDirs helper
...
- we require CMake 2.8.11 now
2015-11-13 22:13:44 +00:00
James Turner
980a98b176
Silence more Clang (Xcode 7) warnings
2015-09-27 20:40:34 -05:00
James Turner
53b41d0284
Drop explicit SDK setting on Mac
2015-09-20 19:44:35 -05:00
James Turner
54de0e9206
RPATH handling for Mac.
2015-06-08 10:37:26 +01:00
James Turner
c98f8e4ac1
Explicit Mac SDK for the moment.
2015-04-11 21:58:55 +01:00
Rebecca N. Palmer
14405fe2e3
Fix compile with CMake 3.2.1, by Kevin Seroux
...
Explicitly link X11, as this no longer comes with OpenGL
2015-04-03 19:15:52 +01:00
James Turner
06a260822c
Make 3.2.1 fix: make thread check platform specific.
2015-03-17 23:33:57 +00:00
James Turner
fe25c42408
Make flag Mac specific.
2015-03-17 23:27:25 +00:00
James Turner
a6b5ab7c74
Fix for Cmake 3.2.1 Mac SDK handling
2015-03-17 22:33:54 +00:00
Clément de l'Hamaide
ba386b314e
Increase required CMake version
...
Qt5 require CMake 2.8.11 or later http://doc.qt.io/qt-5/cmake-manual.html
2015-03-14 18:09:19 +01:00
Clément de l'Hamaide
67d528a46c
Show Qt paths in CMake
2015-03-12 09:45:00 +01:00
James Turner
a466dbce73
Very crude work on GUI base package selection.
...
- feedback on wording greatly appreciated.
- needed to make nightly builds usable without bundled data.
2015-03-08 00:42:05 +00:00
James Turner
f36c81c8cb
Fix where we set OS-X deployment target.
2015-02-24 12:35:26 +00:00
James Turner
84b240b84c
Adjust warning flags for Clang.
2015-02-12 16:24:27 +00:00
James Turner
211a4982c8
Force libc++ explicitly on Clang
2015-02-11 15:48:42 +00:00
James Turner
8c38cf5740
Better CMake policy detection
...
- thanks to Rebecca Palmer for suggesting this!
2015-02-10 17:12:01 +00:00
James Turner
891c8eaa9f
Cmake policies conditional on Cmake version.
2015-02-09 16:42:58 +00:00
James Turner
b8c9cd454e
Force 10.7 deployment version on Mac.
2015-02-09 15:11:28 +00:00
James Turner
7d9609116b
- Make Qt check guarded by a CMake option
...
- Only init QApplication if showing the launcher.
2015-01-10 14:05:23 +00:00
James Turner
72e0ea9e40
Only set AUTOMOC for fglauncher target.
...
(Avoids pointless noise for all other targets)
2015-01-07 09:38:02 +00:00
James Turner
78e8f53312
In-app launcher for Mac, based on Qt5.
...
The old Mac launcher doesn’t work on Yosemite, add a tiny
Qt-based launcher inside the main process (no need to fork /
exec) which runs before the OSG window is created.
Will be merged for 3.4, hopefully with no impact on other
platforms.
2015-01-06 19:13:30 +00:00
James Turner
263bc56b4e
FreeBSD fixes.
...
From:
http://svnweb.freebsd.org/ports/head/games/flightgear/files/
2014-11-13 15:15:52 +00:00
Thomas Geymayer
2520124e97
Update for OpenSceneGraph 3.3.2 API changes.
2014-08-09 19:13:39 +02:00
Thomas Geymayer
a948f68960
CMake: add UTF8-CPP to SimGear include directories.
2014-07-30 12:47:33 +02:00
Christian Schmitt
568dadc898
Only include IAX 3rdparty files if needed
2014-05-31 13:50:28 +02:00
Torsten Dreyer
8da690a2b7
set ENABLE_FLITE=On as default
2014-05-20 10:52:59 +02:00
Clément de l'Hamaide
6d6e45274f
FGadmin: fix compilation, move CMake stuff to better place, remove old ./configure system
2014-04-30 20:34:05 +02:00
Torsten Dreyer
1c5c1b2cb1
Fix hts_engine cmake error
2014-04-30 09:26:58 +02:00
Torsten Dreyer
6ee2fcdd9e
Allow using the system version of flite and the HTS engine
...
By default, if the system version exists and can be used,
then it will be used. Otherwise, the local version will be used
Original patch by Saikrishna Arcot via
https://gitorious.org/fg/flightgear/merge_requests/1582
slightly modified
2014-04-28 21:33:48 +02:00
James Turner
7b2d710cd0
Add hts_engine 1.08 and flite_hts 1.05 code.
...
- Not compiled by default, nor hooked up to anything yet.
- Both libraries licensed under modified BSD license.
- Added top-level CMake file for both, to create a plain static
library for each.
2014-03-10 09:32:43 +00:00
James Turner
230e157190
Raise required OSG version to 3.2.0
2014-02-19 11:00:14 -08:00
James Turner
1c286e4932
Remove some CMake search paths
...
As the comments says, none of these should be needed, or
they are added by CMake automatically.
2014-02-14 20:45:19 +00:00
Erik Hofman
9097f8aac3
Set JSBSim terrain handling code default to ON
2014-02-09 14:10:42 +01:00
Erik Hofman
73a519a95c
Make the JSBSim terrain handling code compile time configurable by calling cmake -DJSBSIM_TERRAIN=1
2014-01-29 13:50:06 +01:00
James Turner
1a372d9366
Update image-server logic.
...
- no dependency on libJpeg or Simgear
- no duplicate rendering of the scene (uses a draw callback)
- supports other image types, eg PNG
- threaded so doesn't block the main loop ever
2014-01-27 09:08:34 +00:00
Clément de l'Hamaide
da05f403b1
Use GSM and Speex libraries from system if they are installed by Saikrishna Arcot
2014-01-23 17:46:49 +01:00
James Turner
590be3f8ff
Initial integration of CrashRpt for Windows.
2014-01-18 14:51:19 +00:00
Rebecca Palmer
bf1fe65bc5
Disable screensaver: initial Linux-only implementation
...
Add a function fgOSDisableScreensaver() that attempts to disable the
screensaver (currently only succeeding on Linux), and call it on startup.
CMake option USE_DBUS (on by default), requires libdbus-1
Motivation: most screensavers do not monitor the joystick
https://bugs.launchpad.net/ubuntu/+source/flightgear/+bug/793599
Discussion: http://sourceforge.net/p/flightgear/mailman/message/31717061/
2013-12-15 21:18:22 +00:00
James Turner
4bb52e46df
Kill of embedded-Simgear CMake mode.
...
This was a silly idea, CMake super-builds from fgmeta are the correct
approach to this going forward.
2013-09-28 14:17:53 +01:00
James Turner
97d89a0c47
Remove all references to libsvn from build.
2013-09-28 14:15:47 +01:00
Clément de l'Hamaide
bebc7235b3
Restore ENABLE_IAX
2013-09-27 20:24:42 +02:00
Clément de l'Hamaide
c022bb8d51
Move IAXClient library into 3rdparty directory
...
Remove ENABLE_IAX option
Add an improved FGCom standalone as part of FG in utils directory
2013-09-27 16:05:45 +02:00
James Turner
0206de2d2c
Relocate Sqlite3 sources, upgrade to 3.8.0.2
...
Move sqlite source to a separate location, and build with
an intermediate library target. This permits us to set compile options
easier, including an important one, NDEBUG, which improves performance.
Sqlite 3.8.0.2 also includes an updated query planner which may improve
some queries, to be tested.
2013-09-26 09:52:41 +01:00
f-jjth
d03b44b662
FGCom integrated into FlightGear.
...
Disabled by default at build time.
2013-08-16 17:02:47 +01:00
hof
8c02a57ff8
Add libdl to FLTK_LIBRARIES when the system supports it. Required for libfltk1.3.
2013-07-18 08:50:22 +01:00
PlutoniumHeart
acf47d00d5
Replacing strdup with _strdup in MSVC
2013-03-07 00:00:47 -07:00
F-JJTH
9fb299b153
Display RTI status like it's done in Simgear
2013-02-18 09:18:39 +00:00
Thomas Geymayer
6c10f99573
Make compiling of all utils/tools optional
2013-02-12 17:38:46 +01:00
James Turner
ead3be2098
Boo, typo.
2013-01-26 14:44:03 +00:00
James Turner
53d9aa4963
Support optionally embedding simgear.
2013-01-26 15:32:18 +01:00
ThorstenB
0937d79075
Fixed incomplete copy&paste issue.
2012-12-01 11:06:50 +01:00
ThorstenB
3b6436bfb8
#946 : some libraries not found on Ubuntu/Debian
...
Ubuntu/Debian introduced "multiarch" library directories, which is
unsupported by CMake <= 2.8.10. Add manual search paths as a workaround.
Currently it is only needed for libsvn, but it is needed for any lib
which is converted to the new directory standard.
2012-12-01 11:01:25 +01:00
Thomas Geymayer
82884ab3c6
Improve finding gperftools and disable profiling by default (even with gperftools installed)
2012-11-19 13:11:03 +01:00
Thomas Geymayer
779a9ae415
Really make profiling commands optional
2012-11-15 13:56:31 +01:00
Thomas Geymayer
fe1222a90d
Optional profiling commands using gperftools
2012-11-15 11:55:37 +01:00
ThorstenB
d94dd2013a
#893 : add missing docs for cmake build option. Thanks to koubiwan.
...
SIMGEAR_SHARED actually worked for FG, but the option wasn't visible in
cmake-gui.
2012-10-04 20:57:35 +02:00
ThorstenB
293d6b3565
Fix compilation with enabled EVENT_INPUT
...
Need to move the definition to the toplevel cmake file, since sources
are no longer compiled on directory level (individual libs per dir).
2012-09-22 14:23:15 +02:00
ThorstenB
acb7fb8e95
Fix shared library build with sqlite
...
Dependency to threading lib is required (It is already provided for
static SimGear).
2012-09-22 14:23:14 +02:00
James Turner
50c61b4211
Allow use of the system's SQLite3 library.
...
Keep distro packagers happy by having the option to use the system's sqlite library instead of our bundled version. Set SYSTEM_SQLITE=1 when running cmake to use the system one.
2012-09-19 14:28:25 +01:00
Frederic Bouvier
bceb942ffa
Support MS VS2012
2012-09-03 17:34:01 +02:00
ThorstenB
7a0db802d2
Improve error message when SimGear headers are missing/incomplete.
...
Also avoid CMake errors when files are missing.
2012-08-26 15:28:51 +02:00
James Turner
c06ab52c55
KIll off ALUT now it's gone from SimGear
2012-08-22 00:10:00 +01:00
ThorstenB
59fe04f8e9
Make web browser app configurable through CMake (for Linux)
...
so package builders don't need local patches.
Also, instead of hardcoded firefox, use "xdg-open" or "sensible-browser"
launchers on Linux, to auto-detect user's preferred browser.
Override with cmake switch -DWEB_BROWSER=...
(Not affecting Mac/Win which are hard-coded anyway).
2012-08-18 14:11:31 +02:00
ThorstenB
9c87aeb1fc
Add cmake Linux distro detection.
2012-08-18 13:40:57 +02:00
ThorstenB
c15af10a7d
CMakeList clean-up.
...
Split into modules for readability.
2012-08-18 13:40:08 +02:00
ThorstenB
f563bea192
Add warning for in-source-directory builds.
2012-07-17 19:19:17 +02:00
James Turner
77cd7b39f7
Since we require OSG 3.0 now, this check is obsolete.
2012-05-15 23:10:53 +01:00
Frederic Bouvier
acadbdeee1
Avoid the dependency on Boost serialization library
2012-05-12 17:20:28 +02:00
Frederic Bouvier
6b008126b5
Begin to implement configurable rendering pipeline
2012-05-12 13:45:31 +02:00
ThorstenB
3d45a2e5a2
Fix C compiler warning.
...
"no-overloaded-virtual" warnings are a CXX-compiler feature
2012-05-05 09:42:25 +02:00
ThorstenB
73d2d3425f
Don't install fg/READMEs
...
which only contain *build instructions* - so they are not useful *after*
installing binaries. User documentation (which should be installed) is in
fgdata/Docs.
2012-04-22 13:46:06 +02:00
ThorstenB
efa18fae1e
Add CMake option to disable building test applications.
2012-04-08 18:49:11 +02:00
James Turner
54d026e64f
Suppress a warning when using Clang.
2012-03-25 18:46:50 +01:00
ThorstenB
60ffb950e2
Consistent white-spacing...
2012-03-12 21:18:37 +01:00
ThorstenB
f453523b67
#706 : Properly set FLTK include directory.
2012-03-12 21:15:05 +01:00
ThorstenB
5f6012802f
Use existing define to supply version number.
2012-01-31 21:42:37 +01:00
ThorstenB
3100da1602
Fix "make package_source" target.
...
Hopefully fixes the Jenkins release builds...
Also use bz2 compression only - same as for simgear.
2012-01-17 23:29:16 +01:00
Torsten Dreyer
3bfee87bba
bump version number to 2.7.0
2012-01-17 08:36:20 +01:00
Torsten Dreyer
979fc9785b
bump version number to 2.6.0
2012-01-17 07:46:52 +01:00
ThorstenB
476a96dacf
Fix copy&paste issue in previous commit... *yuk*
2012-01-03 22:10:56 +01:00
ThorstenB
77640e0863
cmake: Fix Xinerama and Xft dependency issue.
...
Don't try to add Xinerama/Xft libraries, unless these are installed.
It seems these libraries are also not required on all systems (not required
over here...).
2012-01-03 22:02:48 +01:00
ThorstenB
e563e07d5a
Fix Hudson (Jenkins!) BUILD_ID check.
2011-12-28 12:24:22 +01:00
Frederic Bouvier
dc95e5e84b
Try to take care of FLTK external dependencies on Linux
2011-12-18 16:18:46 +01:00
ThorstenB
37453e6b7c
#525 related: add compiler search path for every library
...
Consider search path for every single library as reported/found by CMake.
Most includes sit in the same directory (so the same directory is reported
for almost all libraries), however this may not be the case for every
system or library.
2011-12-18 12:40:34 +01:00
ThorstenB
9933a7cb4a
cmake: add support for Torsten's UDev EventInput
...
(Hopefully meeting Torsten's quality expectations)
2011-12-04 14:37:25 +01:00
ThorstenB
4845037bd7
Fix build with CMake 2.6.4
...
Set search path early enough, so fallback module for CMake 2.6 is found.
2011-11-30 23:33:03 +01:00
ThorstenB
f356854712
Set correct installation folder for documentation
...
Also fix build when ".gitignore" is absent (i.e. building a
cleaned tar-ball).
2011-11-30 19:56:44 +01:00
ThorstenB
b54defea52
cmake: fix sequence of (static) library dependencies
...
sgmath depends on sgprops, sgprops depends on sgstructure.
Also, core libraries are enough for fgadmin.
2011-11-26 16:41:35 +01:00
James Turner
ebfdebeb43
Cocoa menu-bar implementation.
2011-11-20 16:26:05 +00:00
Erik Hofman
269595a366
Merge branch 'next' of git://gitorious.org/fg/flightgear into next
2011-11-20 10:29:23 +01:00
Erik Hofman
5381aafe6d
Read CPACK ignore files from .gitignore
2011-11-20 10:28:20 +01:00
Csaba Halasz
81bb67bc24
build fix: remove extra ) introduced by commit f99e310e
2011-11-06 15:55:06 +01:00
James Turner
f99e310e03
From Roland Häder - fix JPEG-server check when SimGear and OSG live at different prefixes.
2011-11-06 10:51:02 +00:00
James Turner
a4a8d08392
JPEG-server support, in the CMake world.
2011-11-05 17:11:39 +00:00
James Turner
23ae77cedf
CMake support for man page generation
2011-11-04 09:38:07 +00:00
James Turner
4b8ef9c3cf
Add compile-time support for a custom fg-root location, when using CMake
2011-11-01 17:05:54 +00:00
James Turner
e819a4aaa4
Make all FDMs selectable at runtime; default LARCsim/UIUC to off.
2011-11-01 16:21:59 +00:00
James Turner
6ddc8e3390
source packaging for CPack
2011-10-22 16:07:09 +01:00
Frederic Bouvier
90b67e5fd5
Fix win32 cmake build of metar
2011-10-21 14:36:04 +02:00
James Turner
76c388f7cb
Minor CMake packaging tweaks, more to follow.
2011-10-18 12:14:20 +01:00
James Turner
6adb42078e
Refactor fg-home computation, use Library/Application Support on Mac.
2011-10-16 19:55:04 +01:00
James Turner
ab238a1161
Make the common case the default: no library suffix for RelWithDbg or MinSizeRel builds. Of course you can still specify a suffix if desired.
2011-09-26 13:33:06 +01:00
James Turner
16a424ae90
Disable event-input by default on Linux, since libHAL is causing build/deployment issues on some Linux distributions.
2011-09-26 09:56:29 +01:00
James Turner
3a75732488
If DBus is not found, disable event-input on Linux.
2011-09-21 18:00:57 +01:00
James Turner
7dd8f00c42
Enable event-input for joysticks by default on Mac + Linux, in Cmake.
2011-09-21 17:13:13 +01:00
Frederic Bouvier
14fb839c44
Auto detect 3rd Party root for Windows
2011-09-12 11:07:31 +02:00
Mathias Froehlich
81b125069b
cmake: Use a default build type that builds fast executables.
2011-09-12 08:10:48 +02:00
Frederic Bouvier
7a83db28c6
Lower the requirements on Cmake version (at least until Jenkins is updated)
2011-09-11 21:44:43 +02:00
Frederic Bouvier
57754b4ac8
Enforce the use of Cmake 2.8
2011-09-11 20:50:37 +02:00
Mathias Froehlich
549c5eccb9
cmake: Factor out common simgear dependency libs.
...
Factor out and use this core simgear depenency
library cmake variable.
2011-09-11 11:22:10 +02:00
James Turner
a5a8090d52
Cmake: Split simgear libraries into core and scene (only scene uses OSG). Fix linkage issues, and make helper binaries (yasim, terrasync) link against less stuff.
2011-09-08 13:59:40 +01:00
Martin Spott
065f4ee5cb
Make HLA configurable.
...
Permit un-breaking of FlightGear CMake builds on setups with a working HLA
RTI installed, accommodating with recent changes to SimGear CMake.
2011-09-05 20:25:30 +02:00
ThorstenB
c4dc12ec94
Improved CMake support for libsvn
...
Don't detect libsvn without APR.
When installed, enable libsvn support by default (same as for automake).
When enabled, provide libsvn to fgfs.
gitignore temporary CMake files
2011-08-04 18:59:46 +02:00
Torsten Dreyer
dcde3a9350
Try to fix cmake build for fgpanel without GLUT
2011-07-21 23:42:45 +02:00
Torsten Dreyer
8f0f67f668
Enable build of fgpanel by default in cmake
2011-07-21 15:46:29 +02:00
Torsten Dreyer
c238f86637
Bump to version 2.5.0
2011-07-17 11:07:07 +02:00
Torsten Dreyer
172c635f03
Bump version to 2.4.0
2011-07-17 10:47:27 +02:00
ThorstenB
826784eb18
Martin Spott: Add CMake DBus support for event driven input.
...
Tested on Linux only, please improve if you see fit.
2011-06-13 00:45:40 +02:00
ThorstenB
7d92bd3a1a
Martin Spott: fixed sh-like variable in CMakeLists.txt
2011-06-12 15:17:03 +02:00
ThorstenB
ee40e8ae3f
Introduce terrasync subsystem.
...
Fix tile reloading issue.
2011-06-12 00:44:07 +02:00
Torsten Dreyer
2d0d434ffa
cmake: check for SimGear 2.3.0
2011-06-05 21:38:44 +02:00
James Turner
b0985c6b02
Fix for bug 331, cmake was missing mkfifo() check. Thanks to Olaf Flebbe for the catch!
2011-06-02 23:01:17 +01:00
Frederic Bouvier
0baa517b33
Cmake: fix VS2010 link
2011-01-28 15:15:20 +01:00
Frederic Bouvier
ede9a03d07
Cmake: support VS2010 and MSVC 64 bit
2011-01-28 14:57:32 +01:00
Mathias Froehlich
3134acca83
Add the hla stuff to the cmake build system.
2011-01-17 21:35:12 +01:00
Frederic Bouvier
d0a2fbba99
Revert joystick patch. One would have to provide a better one
2011-01-14 22:37:39 +01:00
Frederic Bouvier
4d0a6f5668
Olaf Flebbe: incorporate plib js code to fix problems with MS joysticks under Vista and 7
2011-01-14 21:32:59 +01:00
James Turner
73959885b9
Linux link fixes from Olaf Flebbe
2011-01-13 22:13:58 +00:00
James Turner
5deec69e00
First attempt at libsvn support in terrasync with CMake
...
- not yet working!
2011-01-09 00:15:29 +00:00
James Turner
45d33ef60c
Make fgadmin optional (and hence, the FLTK dependency)
...
Also bump SimGear version to 2.2.0
2011-01-06 16:56:07 +00:00
Frederic Bouvier
402982f901
Cmake: add more utilities to the build system
2011-01-05 17:19:42 +01:00
Frederic Bouvier
670fa26f7e
Cmake: more windows tweaks
2011-01-03 22:47:11 +01:00
Frederic Bouvier
f032943f46
Cmake: add probable location of SimGear
2011-01-03 18:57:08 +01:00
Frederic Bouvier
1028e54cb1
Cmake: MSVC_3RDPARTY_DIR is a path, not an option
2011-01-03 11:37:59 +01:00
James Turner
6d3773cb40
Olaf Flebbe: Removed Boost serialization linkage on MSVC
2011-01-03 09:50:05 +00:00
James Turner
4428b7358c
Fixed CMake version.h, config.h creation
2011-01-01 21:46:16 +00:00
James Turner
61c88af564
CMake: Windows PLIB fixes from Olaf Flebbe.
2011-01-01 21:22:37 +00:00
James Turner
4d1d215ded
version.h support in CMake builds.
2011-01-01 18:24:53 +00:00
Dave Luff
9aa53cb6ab
Remove the cmake ATCDCL conditional switch
...
This was missed from the previous commit, which was only tested
using the autotools.
2010-12-29 17:51:51 +00:00
James Turner
e8500b3f2d
Uninstall rule, pinched from OSG
2010-12-28 13:43:14 +00:00
James Turner
2b5f50e856
WIN32/MSVC fixes from Olaf Flebbe
2010-12-27 12:44:17 +00:00
Tim Moore
958a28b97f
cmake changes for osg::CullSettings::ClearMask and Fedora
...
HAVE_CULLSETTINGS_CLEAR_MASK was not set, so a program to test
CLEAR_MASK was added. The Posix timer function clock_gettime is in
librt on Fedora, and probably on other systems too.
2010-12-26 00:44:02 +01:00
James Turner
7720c9d89e
Another link-ordering fix for CMake, discovered by papillion.
2010-12-22 19:51:17 +00:00
James Turner
a91ec5f9f9
Initial work on CMake build files, with considerable help from Olaf Flebbe.
2010-12-19 15:06:04 +00:00