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
363f2df4fa
Remove function create_target and instead directly use add_library
2022-04-17 18:28:55 +02:00
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
6d0bba9c03
Switch over to standard target_link_libraries (cmake requirements are high enough now).
2022-04-17 17:32:14 +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
495b35032c
Remove erroneous lines.
2022-04-06 20:22:13 +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
688bf1e547
Synchronize with viewer64 source.
2017-01-11 15:36:33 +01:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
38bffcbc4e
KDU 7.3.2 upgrade.
2013-12-05 00:00:15 +01:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
0fddd0f4de
Backout Rev 18389. String returns correctly with KDU 7.1
2012-12-23 11:20:08 -07:00
b80860e244
Provide for standalone builds with KDU.
2012-10-15 09:11:40 -05:00
eb3de8543e
STORM-1023 (was OPEN-4) and STORM-1022 (was OPEN-24) : fmod and kdu changes : cmake changes making possible to use Findxxx when INSTALL_PROPRIETARY is OFF and STANDALONE is OFF too, simplify cmake scripts around INSTALL_PROPRIETARY, add fmodex to FindFMOD
2011-02-24 20:57:34 -08:00
6bd044720e
fix include path for KDU headers
2011-01-19 14:15:24 -08:00
0d6ec39f44
Cmake updates to get llkdu building on linux. Need to rebuild kdu tarball next.
2011-01-19 10:03:51 -08:00
2230b52145
remove develop.py and references to it (use autobuild instead)
2011-01-11 16:07:14 -08:00
3b18f813a8
STORM-151 : Attempt to fix Windows static linking, simplified manifest
2010-11-22 22:41:42 -08:00
37626b32ff
STORM-151 : Modify llkdu cmake to point explicitely to static libs, simplify make (in progress, don't pull yet)
2010-11-19 18:06:56 -08:00
359ed16947
STORM-151 : Modified install.py to point to the new kdu 6.4.1 and changed kdu lib name for windows
2010-11-18 11:22:32 -08:00
04adbdad4b
STORM-151 : Got decompression to work, compression disabled, simplified llkdu building
2010-11-12 16:37:42 -08:00
dac53830f1
STORM-104 : make kdu statically linked, suppress the need for llkdu
2010-10-27 23:40:35 -07:00
2469f765c1
Working around odd corrupted version string interface to kdu library.
2011-08-08 15:19:36 -04:00
f6d0f9952b
Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries references, fixed llkdu cmake to simply point to lib and build
2010-08-24 12:42:38 -07:00
73ca4eac14
Reintroduce check for LLKDU source after downloading the prebuilt lib, to avoid adding a build dependency on it.
2010-08-13 18:34:35 +01:00
c4e5de1b27
Remove check for LLKDU source in the tree before downloading the pre-built lib.
2010-08-13 13:20:02 +01:00
f67e44c503
Fixing the build for PE.
...
Now building with llkdu can be skipped by specifying INSTALL_PROPRIETARY=OFF when configuring the build.
Reviewed by palmer
2009-10-22 15:38:26 -07:00
5f3875018e
svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-10-10 16:04:02 +00:00
fbf15572d9
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
2008-06-12 20:51:41 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Ansariel