diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
| commit | d046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e (patch) | |
| tree | 7c2023e55955c9aed55db9331bae164a386a2d21 /indra/cmake/UI.cmake | |
| parent | 6641e36082f27faa282a0af6f88f381ffc97e179 (diff) | |
| parent | 11d75418fce8372e9976b069070d9d0506766d0d (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/cmake/UI.cmake')
| -rw-r--r-- | indra/cmake/UI.cmake | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index a3423bb895..85e74f03e4 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -5,10 +5,7 @@ include(GLIB) add_library( ll::uilibraries INTERFACE IMPORTED ) -if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - if (NOT USESYSTEMLIBS) - use_prebuilt_binary(fltk) - endif () +if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) target_compile_definitions(ll::uilibraries INTERFACE LL_FLTK=1 LL_X11=1 ) if( USE_CONAN ) @@ -30,7 +27,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ll::gio ) -endif (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +endif () if( WINDOWS ) target_link_libraries( ll::uilibraries INTERFACE opengl32 @@ -48,7 +45,7 @@ if( WINDOWS ) ) endif() -if (NOT USESYSTEMLIBS) +if (FALSE) target_include_directories( ll::uilibraries SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) |