diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 1 | ||||
| -rw-r--r-- | indra/cmake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/GLEXT.cmake | 6 | ||||
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/LLMath.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/LLRender.cmake | 22 | ||||
| -rw-r--r-- | indra/cmake/Mikktspace.cmake | 6 | ||||
| -rw-r--r-- | indra/cmake/TinyGLTF.cmake | 7 | ||||
| -rw-r--r-- | indra/cmake/Tracy.cmake | 3 | ||||
| -rw-r--r-- | indra/cmake/VulkanGltf.cmake | 5 | ||||
| -rw-r--r-- | indra/cmake/xxHash.cmake | 8 |
11 files changed, 61 insertions, 4 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index c848d00710..9535e62e8f 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -187,3 +187,4 @@ if (LINUX OR DARWIN) endif (LINUX OR DARWIN) + diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index f0b35c08f3..1fd83eadff 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -64,6 +64,7 @@ set(cmake_SOURCE_FILES VisualLeakDetector.cmake LibVLCPlugin.cmake XmlRpcEpi.cmake + xxHash.cmake ZLIBNG.cmake ) diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake index 434b6f0ee8..a780966f0c 100644 --- a/indra/cmake/GLEXT.cmake +++ b/indra/cmake/GLEXT.cmake @@ -3,9 +3,7 @@ include(Prebuilt) include(GLH) add_library( ll::glext INTERFACE IMPORTED ) -if (WINDOWS OR LINUX) - use_system_binary(glext) - use_prebuilt_binary(glext) -endif (WINDOWS OR LINUX) +use_system_binary(glext) +use_prebuilt_binary(glext) diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index 92045f7b58..03f1fe39cb 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -4,7 +4,9 @@ include(APR) include(Boost) include(EXPAT) include(Tracy) +include(xxHash) include(ZLIBNG) include(JsonCpp) include(XmlRpcEpi) + ${TRACY_LIBRARY} diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake index a707c75bc4..688e62e24b 100644 --- a/indra/cmake/LLMath.cmake +++ b/indra/cmake/LLMath.cmake @@ -1,2 +1,6 @@ # -*- cmake -*- +include(Variables) +include(Mikktspace) +include(MESHOPTIMIZER) + diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake new file mode 100644 index 0000000000..2d9d3725ad --- /dev/null +++ b/indra/cmake/LLRender.cmake @@ -0,0 +1,22 @@ +# -*- cmake -*- + +include(Variables) +include(FreeType) +include(GLH) +include(GLEXT) + +set(LLRENDER_INCLUDE_DIRS + ${LIBS_OPEN_DIR}/llrender + ${GLH_INCLUDE_DIR} + ${GLEXT_INCLUDE_DIR} + ) + +if (BUILD_HEADLESS) + set(LLRENDER_HEADLESS_LIBRARIES + llrenderheadless + ) +endif (BUILD_HEADLESS) +set(LLRENDER_LIBRARIES + llrender + ) + diff --git a/indra/cmake/Mikktspace.cmake b/indra/cmake/Mikktspace.cmake new file mode 100644 index 0000000000..9fd2becba4 --- /dev/null +++ b/indra/cmake/Mikktspace.cmake @@ -0,0 +1,6 @@ +# -*- cmake -*- +include(Prebuilt) + +if (NOT USESYSTEMLIBS) + use_prebuilt_binary(mikktspace) +endif (NOT USESYSTEMLIBS) diff --git a/indra/cmake/TinyGLTF.cmake b/indra/cmake/TinyGLTF.cmake new file mode 100644 index 0000000000..bb731637a0 --- /dev/null +++ b/indra/cmake/TinyGLTF.cmake @@ -0,0 +1,7 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(tinygltf) + +set(TINYGLTF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tinygltf) + diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake index b3de06a876..cf9c866f8e 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -11,8 +11,11 @@ if (USE_TRACY) use_prebuilt_binary(tracy) target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy) + set(TRACY_LIBRARY "TracyClient") + set(TRACY_LIBRARY "TracyClient") # See: indra/llcommon/llprofiler.h target_compile_definitions(ll::tracy INTERFACE LL_PROFILER_CONFIGURATION=3 ) + set(TRACY_LIBRARY "TracyClient") endif (USE_TRACY) diff --git a/indra/cmake/VulkanGltf.cmake b/indra/cmake/VulkanGltf.cmake new file mode 100644 index 0000000000..94541d5307 --- /dev/null +++ b/indra/cmake/VulkanGltf.cmake @@ -0,0 +1,5 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(vulkan_gltf) + diff --git a/indra/cmake/xxHash.cmake b/indra/cmake/xxHash.cmake new file mode 100644 index 0000000000..a7c1cba62c --- /dev/null +++ b/indra/cmake/xxHash.cmake @@ -0,0 +1,8 @@ +# -*- cmake -*- +if (XXHASH_CMAKE_INCLUDED) + return() +endif (XXHASH_CMAKE_INCLUDED) +set (XXHASH_CMAKE_INCLUDED TRUE) + +include(Prebuilt) +use_prebuilt_binary(xxhash) |