Commit graph

28 commits

Author SHA1 Message Date
xavi92
2004f4ba0c cmake: Rely on CURL::libcurl instead of CURL_LIBRARY
When calling find_package(CURL), different files might be inspected:

- $CMAKE_PREFIX/Modules/FindCURL.cmake
- 3rdParty/lib/cmake/CURL/CURLConfig.cmake

Which file is selected is decided by CMake depending on the context.
Unfortunately, whereas the former defines CURL_LIBRARY, the latter
does not.

However, both define the CURL::libcurl target, from which the library
location can be retrieved with get_property() so as to achieve the
same effect.

Fixing this also makes CURL_NO_CURL_CMAKE redundant.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9582 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 470e785d15589e41bf6f5d1b3c42318bb5ef645e
Former-commit-id: 5f8c279fc814833acdb26ade8979f67950033a8b
2024-10-27 07:54:00 +00:00
xavi92
4681971d6d Remove svn:keywords property from the repository
These properties are not transmitted with git-svn(1) [1], which might
then cause failed patches when modifying lines close to these
properties.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9554 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6ed21e1fe12d01a370842418c35722c75117a30a
Former-commit-id: 8ecd21b7c0211cd000b10b3f0032980f63c06398
2024-10-02 15:30:18 +00:00
xavi92
0e7a45d2be Remove $Id$
This SVN-specific keyword [1] did not expand as expected on Git
repositories migrated from SVN via git-svn(1) [2]. Because of this,
applying patches with modifications would sometimes fail because, even
if these lines were not modified, they could be part of the context
lines, thus heavily confusing Git.

Since it is already expected to migrate from SVN to Git sometime soon,
this would also make $Id$ redundant.

[1]: https://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.keywords.html
[2]: https://git-scm.com/docs/git-svn


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9550 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 7acf9a9675a0496a85ecd61210b8c29c89f9517a
Former-commit-id: 1878bb38889e4dddc83ef762b6b384f0f0a4ecc5
2024-09-30 05:17:15 +00:00
xavi92
6f1afb68b6 thirdpartydeps.cmake: Fix wrong reference to minizip
Findminizip.cmake does not define MINIZIP_LIBRARY, but
minizip_LIBRARIES. Ideally, minizip::minizip should be used instead, but
that seems not to work for some unknown reason.


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9531 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c06a8fe688535315e10a1ece4175eda032d1b850
Former-commit-id: 053d6039517c16770d0b9a8994c72ba58f0c2da1
2024-08-09 10:06:24 +00:00
iobyte
de681128e2 more windows build work
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9524 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 692a5d4cc221908ddaed30eb3dfa80abfb7079e6
Former-commit-id: eae44d17673ae4d2cbaf4580c3ac0619255ce757
2024-08-04 16:18:22 +00:00
iobyte
81fce0966e add cJSON and minizip to thirdpartydeps.cmake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9515 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5f4a5f51923ea856e8bc54989ac4d8ac1e9a478f
Former-commit-id: 035caa02e3af984140911cf92620990212af27a6
2024-07-31 14:04:58 +00:00
beaglejoe
d83fadbede Quiet a CMake warning
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8866 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 3044242c4446d039b0e6bd9826174625c2c875f8
Former-commit-id: 22b1796d5784f7b549c07336f5ccde2f2755fbff
2023-04-04 17:27:56 +00:00
beaglejoe
6b142146cd Find TinyGLTF on Windows
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8865 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 941508cbe6acf08848d3fe00708402fc5e2cde30
Former-commit-id: 5821ec5ab6bf8dea665568198753639fc1287f94
2023-04-04 15:15:42 +00:00
torcs-ng
a1aa6b25f2 - added option_tinygltf
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8864 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2a83de7fe9b2e57c1eb68ddd3041a2b4109583b0
Former-commit-id: f616fdfa72c458b387be6c0b78bcdd7b5c0f7236
2023-04-04 09:19:30 +00:00
beaglejoe
a86f6b106e Fix ADD_OPENAL_LIBRARY()
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8572 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: f57dd4205a8e8fe6c5b99115784e5df85ef5327b
Former-commit-id: f499e9f4c4a5f4b2a795a57a1827df8546632bbc
2022-10-01 22:39:51 +00:00
beaglejoe
f5153bab39 Add macros for vulkan, opencl and glm
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8547 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 501781556aab06065620f43f6e7769631b6d6d1f
Former-commit-id: ef597eff033246b5e9efd9f6afe1bfcf1a433df0
2022-09-25 14:16:46 +00:00
beaglejoe
7309853b9b Separate the real weather from OPTION_WEBSERVER. Real weather is now always available
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8126 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 452790a2a0cb9d22be53af0e4545118e00ae66e1
Former-commit-id: 46bd061d6d49cc22646abe0e8d238accc659bfca
2022-04-26 02:55:50 +00:00
beaglejoe
cacb89eae2 Remove CMake SDL1 code
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7657 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 858db72cefd554825934c81a8d252255cae56b96
Former-commit-id: 17ade6a6b90ab1541bcfad65879926fef79e3518
2021-09-16 21:03:12 +00:00
beaglejoe
719b1b0417 Redo musicplayer to use sdl2_mixer
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7639 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 4f23943768a24920be0e82a7624de520e84f19d0
Former-commit-id: d2374905a4fe1ea01ff40062817184283e1da811
2021-08-31 15:49:49 +00:00
beaglejoe
cf83e04ad7 Changes for OsgHUD on windows (requires osgText)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6503 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 04e4d91e4657c62699b2c36b450818cf8c15fc2d
Former-commit-id: 8dfbb9d4bf457a9afd674a22c7563a7bb7cd0d4e
2017-01-23 02:11:35 +00:00
madbad
af9039930c Add OPTION_WEBSERVER to cmake
to be able to build with/without WEBSERVER 	services

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6270 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c0b1609bda1538082cb2a657166feaa6cc83d31b
Former-commit-id: 0152c643f33dc0b9ce46e90279eb85d471d56e82
2015-11-23 19:44:40 +00:00
madbad
afe4ca8a5c add CURL dependencie to cmake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6257 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5a60f8be2fb1db6f355ae16e27837de5db36d689
Former-commit-id: 9269da49bd0d59cabca3c02f25803ba7128fa1cd
2015-11-23 19:43:03 +00:00
beaglejoe
487e3310ef Added 'OPTION_USE_MACPORTS' to CMake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6100 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 46d755a5d5c2ddfee4710fed90f2c197852f9425
Former-commit-id: 21b68fa6c84949d6535579a3ba7615ca48f817f8
2015-08-31 00:04:57 +00:00
beaglejoe
acf61b5558 CMake changes for Ticket 711 (SDL2 option)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5937 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: cd6252bb58a99a6aba21d68a7d794ffec640aa82
Former-commit-id: 40b19de4d07e2f4a52846fa7404f414035272309
2015-04-01 19:29:12 +00:00
mungewell
fd25b36c22 Fix some repetition in the cmake files
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5805 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: eae78c5023b7da6bca4f2ebb6e32b0d756bdf135
Former-commit-id: b15c14af91e0fb8826b6829d961ae0cf6e0eab91
2014-07-31 04:12:01 +00:00
mungewell
33e3ac9e8b Bug #692 - Initial attempt at replay capability
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5803 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 1f0407f4a4483879b707d900de72ea3970faa1a1
Former-commit-id: 0d2175538d52a91f2216e8aca7928148c482f5d0
2014-07-30 03:19:34 +00:00
beaglejoe
b24d454a21 Remove Menu Music CMake option
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5485 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 29e0a9e657c2bc447328b06c3dd92478c6f7cf41
Former-commit-id: ef7c09760fb0fb9ae6743810c4fcd634bc343eab
2013-05-28 15:50:38 +00:00
torcs-ng
1c27be7d28 update CMake for good configure with osg
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5442 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 187e9480caaecdc53e8b877ffb6baa6dba3be5c2
Former-commit-id: e5e4bf2d54dfbde32a43eed6a91f06bf61067b68
2013-05-10 21:27:14 +00:00
torcs-ng
2111b19874 update cmake
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5441 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c1819302f318e56eabcf5c29b4891f1f17fcfa78
Former-commit-id: 18a7ce6042fa5f246011b9b36b27220a608b25df
2013-05-09 23:10:46 +00:00
torcs-ng
fcc9f3d410 update SDRender (first work with precipitation effect)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5439 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 0973713ff1de20c418725c501ef1ba38d073f15b
Former-commit-id: 215fa9a939abd76d643893799c3f90ab2f0555d0
2013-05-09 22:21:15 +00:00
pouillot
ddabc03da3 Re #771 CMake config updated for MinGW (builds and installs, but runs bad) and MSVC (not tested, should work with AlphaPixel binaries for 2008/2010)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5085 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 36978a651e9f334608d68e1812aca93789b5786f
Former-commit-id: d774ea355704b88cad0e5d044bbd308b5432b787
2013-01-02 15:43:31 +00:00
pouillot
a3472f3e04 Re #755 Applied Joe's menu-music-5040.patch : menu music first step
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5042 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 87495f3c30b0f30c1a875d081960cecd6dabb40d
Former-commit-id: 7cae952707f8401162d76aefd9981452fc7911ea
2012-11-11 15:38:27 +00:00
pouillot
fd5ace6e31 Re #307 Split the big macros.cmake into several smaller and better readable files
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4943 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 97d27758fb627b375f108915683eecd782b9ac59
Former-commit-id: 80a7b425c51272694d4d9518aed18d732474b938
2012-09-14 18:39:40 +00:00