diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-03 21:39:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-03 21:39:03 +0800 |
| commit | 3c05065e1ac740b7e7a3551ae90f0410d630b9e3 (patch) | |
| tree | fd94745db48d47ac931ddc0418158c75078911c1 /indra/cmake/LLPrimitive.cmake | |
| parent | da80a4bd778958a7f8c6d182bf12c676649610ad (diff) | |
| parent | 825c3b0f797a3b5ffb56ef70d08ffef1a52fa26b (diff) | |
Merge branch 'develop'
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 4aa46a5cf8..1e77ec3346 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -19,15 +19,11 @@ if( USE_CONAN ) endif() if( USESYSTEMLIBS ) - if( LINUX ) - 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} ) + if( LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) + # Build of the collada-dom for Linux and FreeBSD is done in + # indra/llprimitive/CMakeLists.txt return () - endif( LINUX ) + endif( LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) if ( ${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/colladadom_installed OR NOT ${colladadom_installed} EQUAL 0 ) if (NOT EXISTS ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4.tar.gz) file(DOWNLOAD @@ -79,12 +75,6 @@ if( USESYSTEMLIBS ) ) endif (${COLLADADOM_RESULT}) else( DARWIN ) - if( CMAKE_SYSTEM_NAME MATCHES FreeBSD ) - execute_process( - COMMAND sed -i "" -e "s/linux/FreeBSD/g" dae/daeUtils.cpp - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src - ) - endif( CMAKE_SYSTEM_NAME MATCHES FreeBSD ) execute_process( COMMAND sed -i "" -e "s/SHARED/STATIC/g" 1.4/CMakeLists.txt WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src |