diff options
| author | callum_linden <none@none> | 2014-10-07 17:35:39 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-07 17:35:39 -0700 |
| commit | c519fd3314eec50ab1557aefb0102b74e9f8770f (patch) | |
| tree | c88090d53d5a7d4c6e8e7b034a65d1d54b1c1f0c /indra/cmake | |
| parent | de4174d80d8af07baa3d81881a0eadc84d275416 (diff) | |
Updates to point to lots of new third party libs and some small tweaks to take account of minor name changes
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/GLEXT.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/GLH.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/XmlRpcEpi.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake index a749644202..415b13033c 100644 --- a/indra/cmake/GLEXT.cmake +++ b/indra/cmake/GLEXT.cmake @@ -3,6 +3,6 @@ include(Prebuilt) if (NOT USESYSTEMLIBS) use_prebuilt_binary(glext) - use_prebuilt_binary(glh_linear) + use_prebuilt_binary(glh-linear) set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) endif (NOT USESYSTEMLIBS) diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake index d5262f2efa..d0992f57b8 100755 --- a/indra/cmake/GLH.cmake +++ b/indra/cmake/GLH.cmake @@ -7,5 +7,5 @@ set(GLH_FIND_QUIETLY TRUE) if (USESYSTEMLIBS) include(FindGLH) else (USESYSTEMLIBS) - use_prebuilt_binary(glh_linear) + use_prebuilt_binary(glh-linear) endif (USESYSTEMLIBS) diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake index 09215f7bee..8c3790ea89 100755 --- a/indra/cmake/XmlRpcEpi.cmake +++ b/indra/cmake/XmlRpcEpi.cmake @@ -7,9 +7,9 @@ set(XMLRPCEPI_FIND_REQUIRED ON) if (USESYSTEMLIBS) include(FindXmlRpcEpi) else (USESYSTEMLIBS) - use_prebuilt_binary(xmlrpc_epi) + use_prebuilt_binary(xmlrpc-epi) if (WINDOWS) - set(XMLRPCEPI_LIBRARIES + set(XMLRPCEPI_LIBRARIES debug xmlrpc-epid optimized xmlrpc-epi ) |