diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
| commit | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch) | |
| tree | ef36b7031df4c96eab6b5f3343325f662382932c /indra/cmake/UI.cmake | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
| parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) | |
Merge
Diffstat (limited to 'indra/cmake/UI.cmake')
| -rwxr-xr-x | indra/cmake/UI.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index d0fd4df03a..58acdc22bd 100755 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -2,7 +2,7 @@ include(Prebuilt) include(FreeType) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindPkgConfig) if (LINUX) @@ -31,7 +31,7 @@ if (STANDALONE) list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES}) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(gtk-atk-pango-glib) if (LINUX) set(UI_LIBRARIES @@ -59,7 +59,7 @@ else (STANDALONE) foreach(include ${${LL_ARCH}_INCLUDES}) include_directories(${LIBS_PREBUILT_DIR}/include/${include}) endforeach(include) -endif (STANDALONE) +endif (USESYSTEMLIBS) if (LINUX) add_definitions(-DLL_GTK=1 -DLL_X11=1) |