diff options
| author | Hiroo Ono <hiroo.ono@gmail.com> | 2024-09-01 21:17:05 +0900 |
|---|---|---|
| committer | Hiroo Ono <hiroo.ono@gmail.com> | 2024-09-01 21:17:05 +0900 |
| commit | ea9ff01bbc249751f7366607d796353784daaf69 (patch) | |
| tree | 3051e8c5fe54404e26f9b1e683a68661a76bcbc0 /indra/cmake | |
| parent | 08113620404175754e5154c90c743f3c9b1330b8 (diff) | |
Build and link collada-dom v2.3-r7 taken from Linden Lab's 3rd party software
repository.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/DepsBuild.cmake | 17 | ||||
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 8 | ||||
| -rw-r--r-- | indra/cmake/Prebuilt.cmake | 11 |
3 files changed, 11 insertions, 25 deletions
diff --git a/indra/cmake/DepsBuild.cmake b/indra/cmake/DepsBuild.cmake deleted file mode 100644 index f4d80e9a67..0000000000 --- a/indra/cmake/DepsBuild.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# -*- cmake -*- -find_program(GIT git) - -macro( checkout_deps_repository DEPSREPO DEPSDIR DEPSTAG) - execute_process( - COMMAND ${GIT} "clone" ${DEPSREPO} ${DEPSDIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../.. - ) - execute_process( - COMMAND ${GIT} "checkout" ${DEPSTAG} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../${DEPSDIR} - ) - execute_process( - COMMAND ${GIT} "pull" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../${DEPSDIR} - ) -endmacro( checkout_deps_repository ) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 6f14c04efc..a649765720 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -19,15 +19,7 @@ if( USE_CONAN ) endif() if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD ) -if(FALSE) - include(FindPkgConfig) - pkg_check_modules(Colladadom REQUIRED collada-dom) - target_compile_definitions( ll::colladadom INTERFACE COLLADA_DOM_SUPPORT141 ) - target_include_directories( ll::colladadom SYSTEM INTERFACE ${Colladadom_INCLUDE_DIRS} ${Colladadom_INCLUDE_DIRS}/1.4 ) - target_link_directories( ll::colladadom INTERFACE ${Colladadom_LIBRARY_DIRS} ) - target_link_libraries( ll::colladadom INTERFACE ${Colladadom_LIBRARIES} ) return () -endif(FALSE) endif(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD ) if( USESYSTEMLIBS ) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 8d911b339c..4034599fde 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -119,3 +119,14 @@ macro ( use_system_binary package ) endif() endmacro() +find_package(Patch) + +# Download the third party software archive and patch it. +macro(prepare_thirdparty url filename dirname patch hash) + file(DOWNLOAD ${url} ${filename} EXPECTED_HASH SHA512=${hash}) + file(ARCHIVE_EXTRACT INPUT ${filename} + DESTINATION ${CMAKE_SOURCE_DIR}/../..) + execute_process(COMMAND ${Patch_EXECUTABLE} "-p1" "-i" + ${CMAKE_SOURCE_DIR}/../patches/${patch} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../${dirname}) +endmacro() |