summaryrefslogtreecommitdiff
path: root/indra/cmake/LLPrimitive.cmake
AgeCommit message (Collapse)Author
13 daysRe-add pcre header directory for macOSErik Kundiman
I thought /opt/local/include wasn't needed since we switched to boost181, but PCRE headers are there. If you still have "boost" installed (maybe depended on by some other package, just deactivate it first before cmake).
2024-09-21ColladaDOM depends on dynamic Boost 1.81 on macOSErik Kundiman
so we don't need the boost package or the -no_static variant of boost181 any more.
2024-09-07Merge branch 'main' into 2024.08-DeltaFPSErik Kundiman
2024-09-01Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-09-01Merge branch 'main' into freebsdHiroo Ono
2024-09-01Build and link collada-dom v2.3-r7 taken from Linden Lab's 3rd party softwareHiroo Ono
repository.
2024-09-01Build private static collada-dom library for Linux and FreeBSD.Hiroo Ono
Clone the repository by git and make it a cmake submodule.
2024-08-31Revert GNU/Linux to use system Collada DOM for nowErik Kundiman
2024-08-31Fix Error: Dae parsing issue on FreeBSDErik Kundiman
by managing to compile LL's ColladaDOM 2.3 on-the-fly.
2024-08-31Make sure ColladaDOM gets built nowErik Kundiman
Spaces are really just troublesome in argument passing. They can't really be escaped, quoting from -D would even replace spaces with semicolons. Hence making use of every variable that can be used in Collada DOM's CMakeLists.txt.
2024-08-31Revert "macOS uses prebuilt Collada DOM binaries"Erik Kundiman
This reverts commit 3bba39cf3e4d56da5aba883479539ed89fa578b9.
2024-08-31macOS uses prebuilt Collada DOM binariesErik Kundiman
2024-08-31Fix logics in deciding to build ColladaDOM or notErik Kundiman
So that colladadom_installed won't throw USESYSTEMLIBS to the next scope. Also libpcrecpp_LIBRARIES doesn't take spaces (might work by escaping the quotes, but only 1 pcrecpp needed anyway).
2024-08-31Revert Linux/BSD to use system Collada DOM for nowErik Kundiman
Turns out getting 2.3 compiled on those platforms need a lot more attention. Apart from that, the compilation result variable name got fixed, the prebuilt include directory got fixed, and pkg-config-ing minizip, libpcrecpp and libxml-2.0 so we can make have generic variable arguments to pass to Collada DOM's CMake settings.
2024-08-30Fix Error: Dae parsing issue - see log for detailsErik Kundiman
https://megapahit.com/show_bug.cgi?id=76 It seems like we have to use LL's Collada DOM 2.3. Make sure minizip is installed on macOS. It should be safe to uninstall your system Collada DOM package now. The CMake arguments might have to be completed for non-Darwin platforms in a next commit.
2024-08-12Update zlib-ng libxml2 libpng freetype minizip-ng boost collada-dom tinygltf ↵Rye Mutt
packages (#2250) Rebuild expat, apr, meshoptimizer, ogg_vorbis, libjpeg-turbo for symbol fixes
2024-08-02Remove dead pcre library dependency (#2177)Rye Mutt
2024-05-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2023-07-19Obtain COLLADA DOM flags when using system libsErik Kundiman
There are also several additional flags from running pkgconf that we don't get from pkg_check_modules. At least 1 is needed later when compiling llprimitive.
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-07-17Be more explicit: Rename use_conan_binary to use_system_binary, this will ↵Nicky
allow us to reuse the macro for more than just conan.
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
2022-04-17Remove function create_target and instead directly use add_libraryNicky
2022-04-17Switch to target_include_directoriesNicky
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-17Switch over to standard target_link_libraries (cmake requirements are high ↵Nicky
enough now).
2022-04-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
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-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2021-09-09SL-14541 MacOS build fixAndrey Kleshchev
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-06-03All: Committing to llqtwebkit2 and the future. Updating all libraries.Monty Brandenberg
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom to 290576, curl to 290567, fontconfig to 290569, freetype to 290557, google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit to 290578, openssl to 290560, PCRE to 290406, zlib to 290556. Document compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake. It is the README for the building process based on things learned during this library project. Switch building process back to style used for new llqtwebkit2 repo. This builds shared libraries for Qt4 products on all platforms using current build machines and TC task templates. All platforms are building. All have comparable FPS rates. Builds are getting quieter. Forward, comrades!
2014-05-28Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.Monty Brandenberg
Release and Debug builds working. Remove the DOM_DYNAMIC define so that we don't create declspec declarations to colladadom objects and pull in libxml2_a (_a for archive) to complete the link. Debug functional and would be moreso if not for all the CrtCheckMemory() calls.
2014-05-28All: Update library SDL to 290309, c-ares to 290089, boost to 290191,Monty Brandenberg
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255, google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157, llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083, pcre to 290150, zlib to 290080. The freetype2 headers are now normalized to what they would normally be on a unix-type system. Libxml2 and pcre are available on all platforms. Libraries generally move in the direction of static archives rather than shared libraries (e.g. openssl). The llqtwebkit side is a step back from the more ambitious goal. What will be used (290262) will be a simple rebuild of the existing 4.7.1 library with updated package dependencies. The bigger work will be in the future.
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus ↵Graham Madarasz
boost lib refs in llprimitive cmake def
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-05-07Build llcorehttp as part of a viewer dependency with unit tests. This requiredMonty Brandenberg
boost::thread and the easiest path to that was to go with the 1.48 Boost release in the 3P tree (eliminating a fork for a modified 1.45 packaging). One unit test, the most important one, is failing in test_httprequest but that can be attended to later. This test issues a GET to http://localhost:2/ and that is hitting the wire but the libcurl plumbing isn't delivering the failure, only the eventual timeout. An unexpected change in behavior.
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-04-22mergeDave Parks
2011-04-18more fix for the libminizip issue for linux.Xiaohong Bao
2011-04-14fixed windows boost library namesBrad Payne (Vir Linden)
2011-04-08changes for newer collada buildBrad Payne (Vir Linden)
2010-10-29Fix for release build (misspelled llprimitive)Dave Parks
2010-10-29SH-262 Fix for debug build on windows.Dave Parks
2010-10-14Updated colladadom.Dave Parks
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2008-08-29Switch more libraries over to target_link_librariesBryan O'Sullivan
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers