diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/NDOF.cmake | 6 | ||||
| -rwxr-xr-x | indra/cmake/UI.cmake | 5 | ||||
| -rwxr-xr-x | indra/cmake/ViewerMiscLibs.cmake | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index 8bad96f6b5..388df16a52 100755 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -8,7 +8,11 @@ if (NDOF) set(NDOF_FIND_REQUIRED ON) include(FindNDOF) else (USESYSTEMLIBS) - use_prebuilt_binary(libndofdev) + if (WINDOWS OR DARWIN) + use_prebuilt_binary(libndofdev) + elseif (LINUX) + use_prebuilt_binary(open-libndofdev) + endif (WINDOWS OR DARWIN) if (WINDOWS) set(NDOF_LIBRARY libndofdev) diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 58acdc22bd..31174209a3 100755 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -32,7 +32,10 @@ if (USESYSTEMLIBS) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) else (USESYSTEMLIBS) - use_prebuilt_binary(gtk-atk-pango-glib) + if (LINUX OR WINDOWS) + use_prebuilt_binary(gtk-atk-pango-glib) + endif (LINUX OR WINDOWS) + if (LINUX) set(UI_LIBRARIES atk-1.0 diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index a805c28598..fc5bdedb5a 100755 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -2,11 +2,11 @@ include(Prebuilt) if (NOT USESYSTEMLIBS) - use_prebuilt_binary(libhunspell) - use_prebuilt_binary(slvoice) if (LINUX) use_prebuilt_binary(libuuid) use_prebuilt_binary(fontconfig) endif (LINUX) + use_prebuilt_binary(libhunspell) + use_prebuilt_binary(slvoice) endif(NOT USESYSTEMLIBS) |