diff options
author | simon <none@none> | 2014-07-07 14:49:45 -0700 |
---|---|---|
committer | simon <none@none> | 2014-07-07 14:49:45 -0700 |
commit | 3e6698073cedc8b24068147cf6b7091f081ea125 (patch) | |
tree | 59d8759c554af8a733668dae9668ca6fd92bf820 /indra/cmake/FreeType.cmake | |
parent | 770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff) | |
parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) |
Merge viewer-release and become version 3.7.12
Diffstat (limited to 'indra/cmake/FreeType.cmake')
-rwxr-xr-x | indra/cmake/FreeType.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index c9a90a9a8d..02c5b37f28 100755 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -1,14 +1,14 @@ # -*- cmake -*- include(Prebuilt) -if (STANDALONE) +if (USESYSTEMLIBS) include(FindPkgConfig) pkg_check_modules(FREETYPE REQUIRED freetype2) -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(freetype) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(FREETYPE_LIBRARIES freetype) -endif (STANDALONE) +endif (USESYSTEMLIBS) link_directories(${FREETYPE_LIBRARY_DIRS}) |