934616de29
Linux: Restore more linux specific cmake configuration that went bye bye in the last merge - fixes the ability to toggle between internal/external browsers in preferences
2023-03-31 01:07:46 +11:00
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
8c552b767f
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/cmake/LLAddBuildTest.cmake
# indra/newview/CMakeLists.txt
2022-09-21 17:08:36 +02:00
a441ce184f
DRTVWR-568: Stop suppressing unused variable warnings -- we fixed?!
2022-09-20 14:27:11 -04:00
45aef2c318
Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled
2022-09-20 19:29:39 +02:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
7471788271
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 19:30:31 +03:00
0e325eab28
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Python.cmake
# indra/llcommon/llsd.h
# indra/llcommon/llstl.h
# indra/llinventory/llparcel.cpp
# indra/llmessage/llmessagethrottle.cpp
# indra/llui/lldockablefloater.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llwatchdog.cpp
# indra/newview/viewer_manifest.py
2022-09-17 14:37:33 +02:00
a35e58b719
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 14:44:14 +03:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
592abc460c
DRTVWR-568: More cleanup of deleted obsolete std library features.
2022-08-26 22:49:16 -04:00
78d8048f38
Add -Wno-unused-variable for Mac.
2022-08-14 19:56:40 +02:00
a9ddc09824
Split Linux warning supression into their own block, disable deprecation warnings thanks to our old boost library ...
2022-08-14 16:18:04 +02:00
e8179b39d9
Bring back -Wno-pragmas for older GCC versions.
2022-08-14 09:48:13 +00:00
b3ec34054a
Clean up compile definitions a bit
2022-08-13 12:05:46 +02:00
62ecb56640
Move viewer specific warnings from variables to viewer cmake.
2022-08-12 18:14:52 +02:00
9e003e13c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-06-18 15:50:56 +02:00
db77862253
Enable signing for OSX.
2022-06-15 19:33:46 +02:00
59f6062685
Bring back comments for EXTERNAL_TOS and LL_IGNORE_SIGCHLD
2022-06-05 16:15:00 +02:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
4416db9a26
Remvoe -D that had been passed in front of each entry of add_compile_definitions, this lead to '-D-D<value>'
2022-04-18 03:08:46 +02:00
1434b4ff96
Remove unused variable.
2022-04-16 19:35:27 +02:00
3eec716b24
Do not use ${ARCH}_linux_INCLUDES atm
2022-04-16 17:17:32 +02:00
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
d3521b4462
Remove obsolete and unmaintained USE_SYSTEMLIBS
2022-04-13 10:28:46 +02:00
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
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
248b6a2584
Don't bother with debug builds,, they are long deprecated.
2022-04-06 23:33:06 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
ee4249378a
Spring cleaning, remove all traces of old 32 bit darwin/linux packages.
2022-02-11 22:11:18 +01:00
3f29e90b3d
Lift block of GCC >= 10, there's probably still issues, but at least that will allow working on those.
2022-02-10 00:22:17 +01:00
0700482f66
Update boost and colladadom with packages build on Bionic Beaver, good bye Xenial Xerus old friend, you served us well over the years.
2022-02-09 21:57:11 +00:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
30ad27c027
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-16 21:09:53 +01:00
4745aab376
DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac build)
2021-11-16 12:17:36 -07:00
4a59f6650f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-15 18:10:02 +01:00
aeed774ff9
(Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition (/Zo)
2021-11-12 15:43:51 -07:00
6254497151
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-10 21:17:02 +01:00
cf74d0fa23
Fail early in case someone wants to compile with GCC >= 10.
2021-10-16 14:38:45 +02:00
160f44375e
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-10-12 12:59:35 +02:00
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03:00
f2cd97a055
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-31 14:49:52 +02:00
060194a9f8
SL-10297: Need VS switch /std:c++17 to use std::string_view.
...
(cherry picked from commit 28deadab5b
2021-05-13 11:40:05 -04:00
26fb5d7af7
SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.
2021-05-07 20:32:04 -04:00
a22cf01271
if using a cache like stashed.io use /Z7 for debug format as /Zi is
...
generally incompatible with all caches for cl.exe
2021-03-28 19:28:26 +02:00
eb0bfc9e10
more cleanup of telemetry support
...
remove superfluous cmake changes
rename profiler to telemetry to avoid confusion
2021-03-21 14:59:02 +00:00
d640123781
Incorporate Tracy profiler as 3p
2021-03-21 14:29:03 +00:00
e6c34f01d2
Revert revert of Simplified Cache viewer release - continue with simplified cache
...
This reverts commit 40ad606ae0906cfe699d
2021-03-10 15:13:12 +01:00
Pork Chop