diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-21 17:35:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-21 17:35:54 +0800 |
| commit | 7dd1149e3649057f0962b85bdc467f4e9299b235 (patch) | |
| tree | c2c59e346126467f9d6f4683f3a97295bbf4bdc3 /indra/llwindow/CMakeLists.txt | |
| parent | b1cfd19724fd1791f5b383e2d9dac71d35ba2167 (diff) | |
Darwin not (directly) relying on Carbon & Obj-C
HiDPI support & multi threaded OpenGL haven't been used since we
switched to SDL2 on Darwin, and so far there hasn't been any sign
that things aren't working any more significantly.
Diffstat (limited to 'indra/llwindow/CMakeLists.txt')
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 9cf31d60d5..120fd1213d 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -89,7 +89,7 @@ if (USESYSTEMLIBS) endif (USESYSTEMLIBS) -if (DARWIN) +if (DARWIN AND (NOT USESYSTEMLIBS)) list(APPEND llwindow_SOURCE_FILES llkeyboardmacosx.cpp llwindowmacosx.cpp @@ -111,7 +111,7 @@ if (DARWIN) PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations -fpascal-strings" ) -endif (DARWIN) +endif (DARWIN AND (NOT USESYSTEMLIBS)) if (WINDOWS) @@ -181,10 +181,10 @@ endif (SDL_FOUND) target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) target_include_directories(llwindow INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -if (DARWIN) +if (DARWIN AND (NOT USESYSTEMLIBS)) include(CMakeFindFrameworks) find_library(CARBON_LIBRARY Carbon) target_link_libraries(llwindow ${CARBON_LIBRARY}) -endif (DARWIN) +endif (DARWIN AND (NOT USESYSTEMLIBS)) include(LibraryInstall) |