diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-08 16:15:09 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-08 16:15:09 +0800 |
| commit | 9d088bea3cc29dde6290db9e6da5dafd4f3ec524 (patch) | |
| tree | f8f8f863d8fbc2df077abde0fc1a981186e38dda | |
| parent | b9ffde7bbee828376d1667e24de467ad445283ce (diff) | |
GLH and Mikktspace can be untarred in packages now
They're custom anyway so very unlikely to be reused in other projects.
TinyGLTF.cmake changes here just to minimise diff, the include
directory setting does not have any effect (just like in TinyEXR.cmake).
| -rw-r--r-- | indra/cmake/GLH.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/TinyGLTF.cmake | 4 | ||||
| -rw-r--r-- | indra/llmath/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 6 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/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/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt index c85d9c75c7..c0a62ad225 100644 --- a/indra/llmath/CMakeLists.txt +++ b/indra/llmath/CMakeLists.txt @@ -98,6 +98,8 @@ set(llmath_HEADER_FILES list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES}) +include_directories(${LIBS_PREBUILT_DIR}/include) + add_library (llmath ${llmath_SOURCE_FILES}) target_link_libraries(llmath llcommon llmeshoptimizer) |