diff options
Diffstat (limited to 'indra/cmake/UI.cmake')
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/UI.cmake | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index f529f5b644..31174209a3 100644..100755 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -1,7 +1,8 @@ # -*- cmake -*- include(Prebuilt) +include(FreeType) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindPkgConfig) if (LINUX) @@ -30,8 +31,11 @@ if (STANDALONE) list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES}) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) -else (STANDALONE) - use_prebuilt_binary(gtk-atk-pango-glib) +else (USESYSTEMLIBS) + if (LINUX OR WINDOWS) + use_prebuilt_binary(gtk-atk-pango-glib) + endif (LINUX OR WINDOWS) + if (LINUX) set(UI_LIBRARIES atk-1.0 @@ -47,17 +51,18 @@ else (STANDALONE) pangoft2-1.0 pangox-1.0 pangoxft-1.0 + ${FREETYPE_LIBRARIES} ) endif (LINUX) include_directories ( - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include + ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) - include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include}) + include_directories(${LIBS_PREBUILT_DIR}/include/${include}) endforeach(include) -endif (STANDALONE) +endif (USESYSTEMLIBS) if (LINUX) add_definitions(-DLL_GTK=1 -DLL_X11=1) |