1
0
Fork 0
Commit graph

154 commits

Author SHA1 Message Date
James Turner
55105baa25 PUI doesn't use SSG (and never has). Ooops. 2012-03-28 09:37:58 +01:00
James Turner
a38362646d Don't create intermediate static libraries for build fgfs. (Speeds up rebuilds in Xcode dramatically, possible in other IDEs too) 2012-03-26 13:09:39 +01:00
ThorstenB
ecb2e77e5b Fix Windows dependencies
SimgGear always needs "winmm" on Windows (due to timeGetTime in sgtimestamp.cxx)
2012-02-25 01:05:39 +01:00
ThorstenB
da73dd97d3 Clean-up cmake (linker) dependencies. 2012-02-24 22:23:15 +01:00
ThorstenB
572847b4cd #537 linker issues due to clock_gettime/librt dependencies
Simplify dependency check and make it work for Debian.
2012-02-24 22:22:14 +01:00
ThorstenB
0ba48793ea Disable OSG dependencies to osg/Vec2 for simgear compile test. 2012-02-19 22:12:52 +01:00
ThorstenB
f589f2c405 More talkative cmake SimGear checks
Give details whether includes or libraries are missing,
or if (and how) the version mismatches.
Also require an exact simgear/flightgear version match.
2012-02-19 20:20:12 +01:00
ThorstenB
ac841ac44f Terrasync clean-up
Avoid code duplication, only UDP processing and
NMEA message parsing remains.
2012-02-19 14:53:04 +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
James Turner
cdc65753f0 Refactor SimGear detection to correctly select debug vs release builds in shared library mode. 2011-11-30 19:19:49 +00:00
James Turner
f054f15693 Fixes for linking with shared SimGear. 2011-11-29 10:24:33 +00:00
James Turner
62810e3f9a Re-structure the SimGear detection, to bypass shared-library checks by default (and unless explicitly requested). Should fix the confusion in the GUI tools about the type of SIMGEAR_LIBRARIES (i.e it should be a list, not a path). 2011-11-28 18:23:34 +00: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
ThorstenB
90c5c9f87a cmake: lib vs lib64 handling for simgear
simgear now always uses CMAKE_INSTALL_LIBDIR for lib installation, so
also use that when searching.
2011-11-25 15:31:22 +01:00
ThorstenB
1a28a933ba Add missing file... (yikes!)
What's wrong with "rename" these days...
2011-11-25 12:14:57 +01:00
ThorstenB
3027424e3e cmake: rename script to avoid downgrading
Use local copy of cmake script only for older cmake versions
2011-11-25 12:12:38 +01:00
James Turner
56bebe2a9b Add GNU install dirs helper to local modules, since it's only available with very newest CMake releases. 2011-11-04 11:08:00 +00:00
Mathias Froehlich
633b07dedc cmake: clear the svn libraries variable if not found. 2011-09-14 09:57:57 +02:00
Frederic Bouvier
587895bf2b Typo 2011-09-12 12:20:22 +02:00
Frederic Bouvier
8a63b26c42 Attempt to make FindSvnClient.cmake portable 2011-09-12 12:14:08 +02:00
Frederic Bouvier
d3d358bdbd Don't try to find winmm 2011-09-12 11:08:32 +02:00
Frederic Bouvier
918202a1ae Fix SVN detection for Windows 2011-09-12 11:08:02 +02:00
Mathias Froehlich
c5b22d248e cmake: Quote argument in FindSvnClient.cmake. 2011-09-11 12:42:59 +02:00
Mathias Froehlich
f4b45eca7e cmake: Use ws2_32.lib instead of the WINSOCK_LIBRARY variable.
Fixup for commit 549c5eccb9.
Do not refer to the no longer existing WINSOCK_LIBRARY variable.
Instead, at this single place where it is used, just use ws2_32.lib.
2011-09-11 12:17:20 +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
Mathias Froehlich
6b6238293f Revert to simgears thread support. Flightgear side.
For all source directories outside of simgear/scene,
which really depends very hard on osg, avoid using osg
classes. This should reenable the use of some basic and
scenegraph independent parts of simgear without the
the need for osg.
2011-09-06 07:31:12 +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
James Turner
7abf7c5748 CMake header support for XCode/Visual Studio 2011-07-19 07:58:03 +01:00
ThorstenB
ba471db647 Martin Spott: CMake DBus module, credit goes to the KDE project
from whom the file was copied.
2011-06-13 00:44:22 +02:00
Mathias Froehlich
2d723d0e13 Fix linking with -lsgtsync with cmake. 2011-06-12 08:29:49 +02:00
Torsten Dreyer
b7656b5275 Change SimGear library order for fgadmin 2011-06-08 16:02:07 +02:00
Tim Moore
9c98258ab0 Merge branch 'releases/2.2.0' into next
Conflicts:
	CMakeModules/FindSvnClient.cmake
	src/FDM/JSBSim/JSBSim.cxx
2011-02-15 13:26:24 +01:00
Frederic Bouvier
c21ba6cb20 Cmake: restore its original name to the ephemeris library 2011-01-23 21:07:24 +01:00
Frederic Bouvier
58550d9e70 Cmake: remove debug messages 2011-01-23 09:49:04 +01:00
Frederic Bouvier
65239f8f53 Build Terrasync with libsvnclient under Windows 2011-01-23 09:42:13 +01:00
James Turner
db3717a30e Working Cmake-terrasync-libsvn support. Probably needs additional refinement, but testable. 2011-01-22 19:24:35 +00:00
James Turner
c1f44b366c Working Cmake-terrasync-libsvn support. Probably needs additional refinement, but testable. 2011-01-19 12:14:59 +00: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
ed4a2369a4 Copy SelectLibraryConfigurations into our modules, to support CMake 2.6 2011-01-14 10:52:38 +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
6564a9858b Fix CMake inclusion for copied FindGit.cmake 2011-01-09 00:04:59 +00:00
James Turner
e3d317d31e Add FindGit from CMake 2.8.3 distribution 2011-01-08 21:43:23 +00:00
Frederic Bouvier
9a0f0cb15a Cmake: fix copy/paste typo 2011-01-08 16:45:40 +01:00
Frederic Bouvier
39ecaf0ca8 Cmake: use debug version of plib when building in debug mode 2011-01-08 15:17:49 +01:00
Frederic Bouvier
311925ecb4 Cmake: use debug version of simgear when building in debug mode 2011-01-08 15:02:30 +01:00
Frederic Bouvier
4b873d974e Cmake: remove debugging message 2011-01-03 19:01:39 +01:00
Frederic Bouvier
c8bdf8c198 Cmake: fix SimGear version check for MSVC 2011-01-03 18:58:15 +01:00
James Turner
61c88af564 CMake: Windows PLIB fixes from Olaf Flebbe. 2011-01-01 21:22:37 +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
James Turner
3f00b27926 Fix link ordering to keep GNU ld happy. 2010-12-19 09:03:35 -08:00
James Turner
a91ec5f9f9 Initial work on CMake build files, with considerable help from Olaf Flebbe. 2010-12-19 15:06:04 +00:00