diff options
| author | Rye <rye@alchemyviewer.org> | 2025-08-27 23:07:22 -0400 |
|---|---|---|
| committer | Rye <rye@alchemyviewer.org> | 2025-08-27 23:07:22 -0400 |
| commit | 34ae3db498e0683b453c923fbff80b441810e96e (patch) | |
| tree | 27ce1dd3fd93c506f5503e89fb64f9d51a39601a /indra/cmake | |
| parent | 3f65a4bfec71a9950a541f9e6195a572a0622b48 (diff) | |
| parent | dae43ad532579e849aa191fba4fdb3478a455840 (diff) | |
Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/CEFPlugin.cmake | 1 | ||||
| -rw-r--r-- | indra/cmake/PluginAPI.cmake | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake index 9b77becf29..e27929fa08 100644 --- a/indra/cmake/CEFPlugin.cmake +++ b/indra/cmake/CEFPlugin.cmake @@ -29,7 +29,6 @@ elseif (DARWIN) ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a ${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a ${APPKIT_LIBRARY} - "-F ${CEF_LIBRARY}" ) elseif (LINUX) diff --git a/indra/cmake/PluginAPI.cmake b/indra/cmake/PluginAPI.cmake index 114415e514..a2bf13db2c 100644 --- a/indra/cmake/PluginAPI.cmake +++ b/indra/cmake/PluginAPI.cmake @@ -1,5 +1,7 @@ # -*- cmake -*- +include(OpenGL) + add_library( ll::pluginlibraries INTERFACE IMPORTED ) if (WINDOWS) @@ -13,4 +15,6 @@ if (WINDOWS) ) endif (WINDOWS) +target_link_libraries( ll::pluginlibraries INTERFACE OpenGL::GL) +target_include_directories( ll::pluginlibraries INTERFACE ${CMAKE_SOURCE_DIR}/llimage ${CMAKE_SOURCE_DIR}/llrender) |