diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-20 16:16:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-20 20:52:45 +0800 |
| commit | ad5dec92bcb7d11e6a48b6ec6a220a49de985351 (patch) | |
| tree | 3870c4c7f1c9521c6ad40d1cfe1b1d8fc39882ef /indra/llwindow/CMakeLists.txt | |
| parent | 16299d3a3631e4c42367cf40410ad6995e585384 (diff) | |
| parent | a65bc46b138b89200586b29fe729cbc7b0f0c8c4 (diff) | |
Merge remote-tracking branch 'secondlife/release/maint-b' into maint-b
Diffstat (limited to 'indra/llwindow/CMakeLists.txt')
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 1e3c517483..3f5fd2f9ce 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 @@ -65,8 +64,8 @@ include_directories(${CMAKE_SOURCE_DIR}/llrender) # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level if (USESYSTEMLIBS) - list(APPEND viewer_SOURCE_FILES - llkeyboardsdl.cpp + list(APPEND viewer_SOURCE_FILES + llkeyboardsdl.cpp llwindowsdl.cpp ) list(APPEND viewer_HEADER_FILES @@ -86,7 +85,6 @@ if (USESYSTEMLIBS) fontconfig # For FCInit and other FC* functions. ) endif (BUILD_HEADLESS) - endif (USESYSTEMLIBS) if (DARWIN AND (NOT USESYSTEMLIBS)) @@ -182,7 +180,7 @@ endif (SDL_FOUND) target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - + if (DARWIN AND (NOT USESYSTEMLIBS)) include(CMakeFindFrameworks) find_library(CARBON_LIBRARY Carbon) |