Commit Graph

44550 Commits (363f2df4fa22b3eb95ff4603d73b7a042f3fefd1)

Author SHA1 Message Date
Nicky 363f2df4fa Remove function create_target and instead directly use add_library 2022-04-17 18:28:55 +02:00
Nicky e0cf0cdfd4 Switch to target_include_directories
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
Nicky 6d0bba9c03 Switch over to standard target_link_libraries (cmake requirements are high enough now). 2022-04-17 17:32:14 +02:00
Nicky 34b5c5e890 Switch to USE_OPENAL 2022-04-16 23:01:00 +02:00
Nicky 5994ca8531 Remove another place where there was some hand crafted logic to deal with bugsplat defines 2022-04-16 22:58:06 +02:00
Nicky a950940adb Streamline fmodstudio/openal targets:
- Targets now define the appropriate c++ defines, no more hand magic needed for llstartup.cpp
- Switch cmakeflage to USE_xxx rather than xxx as it was before. I personally find the USE_X notion more intuitive and it follows how KDU is used.
- To be backward compatible OPENAL/FMODSTUDIO flag will be mapped to USE_OPENAL/USE_FMODSTUDIO
2022-04-16 22:57:09 +02:00
Nicky 3ac18ad993 Streamline bugsplat target:
- Fix usage of bugsplat::bugsplat by using ll::bugsplat
- Use bugsplat define by importing target not by using hand crafted magic
2022-04-16 22:08:40 +02:00
Nicky 2c3507a9d2 Cleanup plugin, create proper target for link libraries. Remove unused
variables.
2022-04-16 19:58:17 +02:00
Nicky c7ea88046b Remove undefined variables 2022-04-16 19:57:35 +02:00
Nicky 0eb2d8056a Pull in LL_GLOD=1 via target, not by hand crafted magic. 2022-04-16 19:55:58 +02:00
Nicky 9b34575ba8 Include Linking to pull in the definition of ARCH_PREBUILT_DIRS_RELEASE 2022-04-16 19:53:51 +02:00
Nicky d006f01c64 Cleanup, remove unused variable 2022-04-16 19:53:25 +02:00
Nicky 7bd0b8306b Make Pulseaudio.cmake just error out. a) it is broken (there is no 3p
for example), the define it sets it used. The vrabiables it did set are
unused.

There is a case to probe for pulseaudio and this is the Linux volume
catcher. But for that it is only necessary to detect the system include
to get a few defines and functions
2022-04-16 19:51:24 +02:00
Nicky 4934b65298 Cleanup 2022-04-16 19:51:02 +02:00
Nicky 5c05466bc4 Remove unused HEADLESS case 2022-04-16 19:50:26 +02:00
Nicky 64fbf878a4 Cleanup 2022-04-16 19:49:55 +02:00
Nicky 4d4caaaf1f Removed unused HEADLESS case. 2022-04-16 19:49:08 +02:00
Nicky ddc2c0265d slvoice_src_dir seems generally not used/ever valid. Not 100% sure
what's with that, maybe it gets set by LLs teamcity builds?
2022-04-16 19:36:15 +02:00
Nicky 1434b4ff96 Remove unused variable. 2022-04-16 19:35:27 +02:00
Nicky cc48def709 Initialize variables so that calling cmake with "--warn-unused-vars --warn-uninitialized" does
not make it go all crazy.
2022-04-16 18:03:04 +02:00
Nicky cf08197ad3 Use variable LLSTARTUP_COMPILE_FLAGS only when it is defined. 2022-04-16 17:30:54 +02:00
Nicky bb35d5a599 Remove some more obsolete includes (UnixInstall) and include_directories() 2022-04-16 17:30:09 +02:00
Nicky 924fa0fa78 create target ll::uilibraries to have one common target that defines what each
operation system needs as dependencies on OS gui libraries.
2022-04-16 17:28:26 +02:00
Nicky f673b958fe Go back to more modern way to compile the physics stub 2022-04-16 17:20:16 +02:00
Nicky 5803625db5 Remove undefined variable GOOGLE_PERFTOOLS_LIBRARIES 2022-04-16 17:18:38 +02:00
Nicky 3eec716b24 Do not use ${ARCH}_linux_INCLUDES atm 2022-04-16 17:17:32 +02:00
Nicky 7d6bb21c9c Remove unset GOOGLEMOCK_INCLUDE_DIRS variable. 2022-04-16 17:13:52 +02:00
Nicky 4c1ce6bd72 Fix a typo. 2022-04-16 17:13:28 +02:00
Nicky c0c5ac0e39 Only try copy voice files from slvoice_src_dir if that variable is set (seems to be the case for Windows) 2022-04-16 17:12:24 +02:00
Nicky e45a6a0f68 Remove obsolete message 2022-04-16 15:35:41 +02:00
Nicky a9774d3427 Request C++ standard via standard cmake. 2022-04-16 15:35:13 +02:00
Nicky b9f94c0897 Now there is a oslibrary target get rid of some more obsolete vars:
LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-16 15:33:32 +02:00
Nicky bb85651d98 Create a new target ll::oslibrary to link against libs specific to the OS compiled on.
This gets rid of the a few OS specific set and uses variables (which some even seemed mostly
duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of
having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-16 15:29:02 +02:00
Nicky c8eb53859f Remove unused code 2022-04-16 14:21:26 +02:00
Nicky 5aea7576b0 Simple reformat with CLion 2022-04-16 14:20:31 +02:00
Nicky db8bc69684 Dependency on target xml-rpc-epi got lost, bring it back 2022-04-13 21:27:27 +02:00
Nicky c3ed09fdda Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-04-13 19:29:08 +02:00
Nicky 6417836e69 FindSCP.cmake is used when INSTALL_PROPRIETARY is set. Not sure what the latter does, but I suppose
some internal logic on the LL build farm.
2022-04-13 19:27:02 +02:00
Nicky 241919e7f7 Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13 19:21:55 +02:00
Nicky 2c9ede0ccc Remove another old remnant of the debug config. 2022-04-13 10:29:10 +02:00
Nicky d3521b4462 Remove obsolete and unmaintained USE_SYSTEMLIBS 2022-04-13 10:28:46 +02:00
Nicky 07d388f416 Make LIB_NDOF define part of the targets interface 2022-04-10 23:43:15 +02:00
Nicky d01e81f4d1 Fix warning supression for Linux/OSX, this was broken after the first round of cmake changes on Windows.
-Wno-unused-but-set-variable/-Wno-unused-variable moved from just Linux to also OSX (clang) as there's a lot of those
in the code where newer xcode complains. Fixing all those places is going beyond the scope of modernizing cmake.
2022-04-09 23:40:22 +02:00
Nicky 7382fce79e Cleanup windows step that copies input artifacts. Make sure the right
paths are used, throw out files not even existing anymore.
2022-04-09 20:19:46 +02:00
Nicky 0980a94341 Bump cmake version needed up to 3.16 so target_precompile_headers can be
used.
2022-04-09 20:15:07 +02:00
Nicky 37595f90f9 Cleanup ... use the appropriate functions to set options. Before
this everythig was over the place how it was set, worse even with wrong
functions like:
- add_definitions( /arch:SSE2 )
- add_definitions(/WX)
Those are each options to cl, not definitons.
2022-04-09 19:05:58 +02:00
Nicky 6e1ae6ec7b Raise the bar to cmake 3.13, this gives access to more modern
constructs.
2022-04-09 19:03:44 +02:00
Nicky 37f652206b Using Ninja leads to subtly different path than using a multi config generate like
xcode or visual studio.
2022-04-07 02:41:35 +02:00
Nicky 6cb984022a When opening contributions.txt viewer_manifest.py was making assumptios of the build
tree layout and how it should be relative to the source tree. This is not necessarily correct.
By using 'source' and constructiong the path relative to this directory we always get a correct
answer.
2022-04-07 02:39:30 +02:00
Nicky 4f2831c54b Remove some more traces of obsolte debug builds. 2022-04-07 02:38:38 +02:00