diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-11 19:19:22 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-11 19:19:22 -0400 |
| commit | e72d546fe36ffb262a6a844ac4aae432df357ed5 (patch) | |
| tree | b4d0a14b5c7bc4f3ef0f54b711bf2b6e0750b79d /indra/cmake | |
| parent | 6631dc22f0513b5ffe28ca48f95ee31fc684d195 (diff) | |
Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
Part of the switchover to dynamic Qt4. This mostly completes the
Mac side. Webkit is functional on Mac, plugins work. The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac). Also
need to address libz.dylib vs libz.a. Currently resolving against
dylib which is not what I want.
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 1 | ||||
| -rwxr-xr-x | indra/cmake/Linking.cmake | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index f2fbc8c775..5dfa6ea4fb 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -225,7 +225,6 @@ elseif(DARWIN) libexpat.dylib libGLOD.dylib libhunspell-1.3.0.dylib - libllqtwebkit.dylib libminizip.a libndofdev.dylib libssl.dylib diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index b9c9e531fc..74fe3f1137 100755 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -6,6 +6,7 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") include(Variables) set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib) +set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins) set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release) set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug) if (WINDOWS) |