diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-09 21:05:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-09 21:05:54 +0800 |
| commit | 36585539dcf15af82335b9c106f41696823dc4b1 (patch) | |
| tree | e599ecd76e9f31c05efb2febebf22d0377ec7ced /indra/cmake | |
| parent | d44065eb6d90af47401e9d0b76ad560edbb4927b (diff) | |
| parent | ecdbdc8ea6fbd9a918584be1191e012af4b38af3 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/GLH.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/NDOF.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/TinyGLTF.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake index 09f7d568be..bdd8bc4836 100644 --- a/indra/cmake/GLH.cmake +++ b/indra/cmake/GLH.cmake @@ -4,9 +4,8 @@ include(Prebuilt) add_library( ll::glh_linear INTERFACE IMPORTED ) if (USESYSTEMLIBS) - target_include_directories(ll::glh_linear SYSTEM INTERFACE - ${CMAKE_SYSROOT}/usr/local/include) - return () + target_include_directories( ll::glh_linear SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) + return () endif () use_system_binary( glh_linear ) diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index b88fbccf2a..aa0f0d042c 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -7,11 +7,13 @@ include_guard() add_library( ll::ndof INTERFACE IMPORTED ) if (NDOF) + if (NOT USESYSTEMLIBS) if (WINDOWS OR DARWIN) use_prebuilt_binary(libndofdev) elseif (LINUX) use_prebuilt_binary(open-libndofdev) endif (WINDOWS OR DARWIN) + endif (NOT USESYSTEMLIBS) if (WINDOWS) target_link_libraries( ll::ndof INTERFACE libndofdev) diff --git a/indra/cmake/TinyGLTF.cmake b/indra/cmake/TinyGLTF.cmake index b20a2a41de..7e74089208 100644 --- a/indra/cmake/TinyGLTF.cmake +++ b/indra/cmake/TinyGLTF.cmake @@ -2,10 +2,8 @@ include(Prebuilt) if (NOT USESYSTEMLIBS) - use_prebuilt_binary(tinygltf) +endif (NOT USESYSTEMLIBS) set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf) -endif (NOT USESYSTEMLIBS) - diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 59725ecc65..f1a4d43f90 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -204,7 +204,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "") set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES) set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO) - set(CMAKE_OSX_ARCHITECTURES "${ARCH}") + #set(CMAKE_OSX_ARCHITECTURES "${ARCH}") string(REPLACE "i686" "i386" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") string(REPLACE "AMD64" "x86_64" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |