From dc934629919bdcaea72c78e5291263914fb958ec Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 11 May 2009 20:05:46 +0000 Subject: svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3 --- indra/viewer_components/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 indra/viewer_components/CMakeLists.txt (limited to 'indra/viewer_components/CMakeLists.txt') diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt new file mode 100644 index 0000000000..d5eea0d0b0 --- /dev/null +++ b/indra/viewer_components/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(login) -- cgit v1.2.3 From 8a8edfd98c7fced23f4c1f8dd5e4f65e1cadfce8 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Thu, 18 Jun 2009 23:42:51 +0000 Subject: First pieces of event host module (DEV-31978). Basically implements the spec nat decribed in the jira. Test coverage isn't yet complete though. mostly paired with nat. --- indra/viewer_components/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/viewer_components/CMakeLists.txt') diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt index d5eea0d0b0..60b459b78a 100644 --- a/indra/viewer_components/CMakeLists.txt +++ b/indra/viewer_components/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory(login) +add_subdirectory(eventhost) -- cgit v1.2.3 From 7c1742ec7d626ff34084624729b338f9abc58686 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 30 Jun 2009 19:12:39 -0400 Subject: Added hack for fetching eventlet in place of svn:externals. --- indra/viewer_components/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/viewer_components/CMakeLists.txt') diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt index 60b459b78a..b3e07c527c 100644 --- a/indra/viewer_components/CMakeLists.txt +++ b/indra/viewer_components/CMakeLists.txt @@ -1,2 +1,9 @@ +# -*- cmake -*- + +include(Externals) + add_subdirectory(login) add_subdirectory(eventhost) + +use_svn_external(eventlet ${CMAKE_CURRENT_SOURCE_DIR}/../lib/python/ http://svn.secondlife.com/svn/eventlet/trunk/eventlet 164) + -- cgit v1.2.3 From 8b7f7143d6a755c5299bc4f2c9bbbd33c79344aa Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 10 Jul 2009 14:53:11 -0700 Subject: Brad's changes to testquit so we can pass executable to run to it. Switching eventlet to use subrepo. By Brad, reviewed by Palmer --- indra/viewer_components/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/viewer_components/CMakeLists.txt') diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt index b3e07c527c..c95c854b7c 100644 --- a/indra/viewer_components/CMakeLists.txt +++ b/indra/viewer_components/CMakeLists.txt @@ -1,9 +1,5 @@ # -*- cmake -*- -include(Externals) - add_subdirectory(login) add_subdirectory(eventhost) -use_svn_external(eventlet ${CMAKE_CURRENT_SOURCE_DIR}/../lib/python/ http://svn.secondlife.com/svn/eventlet/trunk/eventlet 164) - -- cgit v1.2.3