1 files changed, 10 insertions, 7 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 7b1430c67c..6b70d66d7a 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -51,7 +51,6 @@ set(llwindow_LINK_LIBRARIES
         llcommon
         llimage
         llmath
-        llrender
         llfilesystem
         llxml
         ll::glh_linear
@@ -59,11 +58,14 @@ set(llwindow_LINK_LIBRARIES
         ll::uilibraries
         ll::SDL
         )
+
+include_directories(${CMAKE_SOURCE_DIR}/llrender)
+
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
-if (LINUX)
-  list(APPEND viewer_SOURCE_FILES 
-       llkeyboardsdl.cpp 
+if (USESYSTEMLIBS AND NOT DARWIN)
+  list(APPEND viewer_SOURCE_FILES
+       llkeyboardsdl.cpp
        llwindowsdl.cpp
        )
   list(APPEND viewer_HEADER_FILES
@@ -83,8 +85,7 @@ if (LINUX)
         fontconfig          # For FCInit and other FC* functions.
         )
   endif (BUILD_HEADLESS)
-
-endif (LINUX)
+endif (USESYSTEMLIBS AND NOT DARWIN)
 
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
@@ -179,9 +180,11 @@ endif (SDL_FOUND)
 
   target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
   target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-  
+
 if (DARWIN)
   include(CMakeFindFrameworks)
   find_library(CARBON_LIBRARY Carbon)
   target_link_libraries(llwindow ${CARBON_LIBRARY})
 endif (DARWIN)
+
+include(LibraryInstall)