Skip to content
Snippets Groups Projects
Commit 343ffb9d authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

Remove Pth library from viewer build.

This library was only needed on the Mac, and only with the OS X 10.4 SDK. As
of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK
we're currently using directly supports the functionality for which we
originally brought in Pth.
parent 30cd9f7d
No related branches found
No related tags found
No related merge requests found
...@@ -1351,30 +1351,6 @@ ...@@ -1351,30 +1351,6 @@
</map> </map>
</map> </map>
</map> </map>
<key>pth</key>
<map>
<key>license</key>
<string>lgpl</string>
<key>license_file</key>
<string>LICENSES/pth.txt</string>
<key>name</key>
<string>pth</string>
<key>platforms</key>
<map>
<key>darwin</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>2172379794217d0ffba0db09b2ac17bf</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20110303.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
</map>
</map>
</map>
<key>quicktime</key> <key>quicktime</key>
<map> <map>
<key>license</key> <key>license</key>
......
# -*- cmake -*-
include(Prebuilt)
set(PTH_FIND_QUIETLY ON)
set(PTH_FIND_REQUIRED ON)
if (STANDALONE)
# ?? How would I construct FindPTH.cmake? This file was cloned from
# CURL.cmake, which uses include(FindCURL), but there's no FindCURL.cmake?
# include(FindPTH)
else (STANDALONE)
# This library is only needed to support Boost.Coroutine, and only on Mac.
if (DARWIN)
use_prebuilt_binary(pth)
set(PTH_LIBRARIES pth)
set(PTH_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
else (DARWIN)
set(PTH_LIBRARIES)
set(PTH_INCLUDE_DIRS)
endif (DARWIN)
endif (STANDALONE)
...@@ -7,7 +7,6 @@ include(00-Common) ...@@ -7,7 +7,6 @@ include(00-Common)
include(LLCommon) include(LLCommon)
include(Linking) include(Linking)
include(Boost) include(Boost)
include(Pth)
include(LLSharedLibs) include(LLSharedLibs)
include(GoogleBreakpad) include(GoogleBreakpad)
include(GooglePerfTools) include(GooglePerfTools)
...@@ -18,7 +17,6 @@ include_directories( ...@@ -18,7 +17,6 @@ include_directories(
${EXPAT_INCLUDE_DIRS} ${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
${PTH_INCLUDE_DIRS}
) )
# add_executable(lltreeiterators lltreeiterators.cpp) # add_executable(lltreeiterators lltreeiterators.cpp)
...@@ -287,7 +285,6 @@ target_link_libraries( ...@@ -287,7 +285,6 @@ target_link_libraries(
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY} ${BOOST_REGEX_LIBRARY}
${PTH_LIBRARIES}
${GOOGLE_PERFTOOLS_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES}
) )
......
This diff is collapsed.
...@@ -150,7 +150,6 @@ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (U ...@@ -150,7 +150,6 @@ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (U
jpeglib Copyright (C) 1991-1998, Thomas G. Lane. jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
ogg/vorbis Copyright (C) 2001, Xiphophorus ogg/vorbis Copyright (C) 2001, Xiphophorus
OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
Pth Copyright (C) 1999-2006 Ralf S. Engelschall &lt;rse@gnu.org&gt;
SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
xmlrpc-epi Copyright (C) 2000 Epinions, Inc. xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
......
...@@ -9,13 +9,11 @@ endif(LL_TESTS) ...@@ -9,13 +9,11 @@ endif(LL_TESTS)
include(LLCommon) include(LLCommon)
include(LLMath) include(LLMath)
include(LLXML) include(LLXML)
include(Pth)
include_directories( include_directories(
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS}
${PTH_INCLUDE_DIRS}
) )
set(login_SOURCE_FILES set(login_SOURCE_FILES
...@@ -42,7 +40,6 @@ target_link_libraries(lllogin ...@@ -42,7 +40,6 @@ target_link_libraries(lllogin
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
${LLXML_LIBRARIES} ${LLXML_LIBRARIES}
${PTH_LIBRARIES}
) )
if(LL_TESTS) if(LL_TESTS)
...@@ -50,11 +47,5 @@ if(LL_TESTS) ...@@ -50,11 +47,5 @@ if(LL_TESTS)
lllogin.cpp lllogin.cpp
) )
set_source_files_properties(
lllogin.cpp
PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${PTH_LIBRARIES}"
)
LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")
endif(LL_TESTS) endif(LL_TESTS)
...@@ -1252,53 +1252,6 @@ anguage Infrstructure (CLI) international standard</string> ...@@ -1252,53 +1252,6 @@ anguage Infrstructure (CLI) international standard</string>
</map> </map>
</map> </map>
</map> </map>
<key>pth</key>
<map>
<key>copyright</key>
<string>Copyright (c) 1999-2006 Ralf S. Engelschall &lt;rse@gnu.org&gt;</string>
<key>description</key>
<string>Portable cooperative threads package, used to support Boost.Coroutine on Mac OS X 10.4</string>
<key>license</key>
<string>lgpl</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>216cb6217a06c64dfae30a55ab8b975c</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20090923.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>c5c2f73847c126e679d925beab48c7d4</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-linux-20090427.tar.bz2</uri>
</map>
<key>linux32</key>
<map>
<key>md5sum</key>
<string>c5c2f73847c126e679d925beab48c7d4</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-linux32-20090427.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>c5c2f73847c126e679d925beab48c7d4</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-linux64-20090427.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>c5c2f73847c126e679d925beab48c7d4</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-windows-20090427.tar.bz2</uri>
</map>
</map>
</map>
<key>pulseaudio</key> <key>pulseaudio</key>
<map> <map>
<key>copyright</key> <key>copyright</key>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment