summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-10-03 17:53:28 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-10-03 17:53:28 -0700
commit0ca59987843cfcaedb12592b9466567ef421c4e8 (patch)
tree9b2282a46ca626ecec094ecdce6ed75db40b28e3 /indra
parent36df0f8a06629c5a14358c07d0f12ce1019f066e (diff)
Backed out changeset: eb957fafe167
Diffstat (limited to 'indra')
-rw-r--r--indra/CMakeLists.txt2
-rw-r--r--indra/cmake/CMakeLists.txt2
-rw-r--r--indra/integration_tests/llimage_libtest/CMakeLists.txt2
-rw-r--r--indra/integration_tests/llui_libtest/CMakeLists.txt2
-rw-r--r--indra/linux_crash_logger/CMakeLists.txt2
-rw-r--r--indra/linux_updater/CMakeLists.txt2
-rw-r--r--indra/llaudio/CMakeLists.txt2
-rw-r--r--indra/llcharacter/CMakeLists.txt2
-rw-r--r--indra/llcommon/CMakeLists.txt2
-rw-r--r--indra/llcrashlogger/CMakeLists.txt2
-rw-r--r--indra/llimage/CMakeLists.txt2
-rw-r--r--indra/llimagej2coj/CMakeLists.txt2
-rw-r--r--indra/llinventory/CMakeLists.txt2
-rw-r--r--indra/llkdu/CMakeLists.txt2
-rw-r--r--indra/llmath/CMakeLists.txt2
-rw-r--r--indra/llmessage/CMakeLists.txt2
-rw-r--r--indra/llplugin/CMakeLists.txt2
-rw-r--r--indra/llplugin/slplugin/CMakeLists.txt2
-rw-r--r--indra/llprimitive/CMakeLists.txt2
-rw-r--r--indra/llrender/CMakeLists.txt2
-rw-r--r--indra/llui/CMakeLists.txt2
-rw-r--r--indra/llvfs/CMakeLists.txt2
-rw-r--r--indra/llwindow/CMakeLists.txt2
-rw-r--r--indra/llxml/CMakeLists.txt2
-rw-r--r--indra/mac_crash_logger/CMakeLists.txt2
-rw-r--r--indra/mac_updater/CMakeLists.txt2
-rw-r--r--indra/media_plugins/base/CMakeLists.txt2
-rw-r--r--indra/media_plugins/example/CMakeLists.txt2
-rw-r--r--indra/media_plugins/gstreamer010/CMakeLists.txt2
-rw-r--r--indra/media_plugins/quicktime/CMakeLists.txt2
-rw-r--r--indra/media_plugins/webkit/CMakeLists.txt2
-rw-r--r--indra/media_plugins/winmmshim/CMakeLists.txt2
-rw-r--r--indra/newview/CMakeLists.txt2
-rw-r--r--indra/test/CMakeLists.txt2
-rw-r--r--indra/test_apps/llplugintest/CMakeLists.txt2
-rw-r--r--indra/viewer_components/login/CMakeLists.txt2
-rw-r--r--indra/viewer_components/updater/CMakeLists.txt2
-rw-r--r--indra/win_crash_logger/CMakeLists.txt2
-rw-r--r--indra/win_updater/CMakeLists.txt2
39 files changed, 39 insertions, 39 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 1b1756d2db..1cebb53a07 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -14,7 +14,7 @@ endif (COMMAND cmake_policy)
set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
"The root project/makefile/solution name. Defaults to SecondLife.")
-project(${ROOT_PROJECT_NAME} CXX)
+project(${ROOT_PROJECT_NAME})
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 548f4d1682..569034a6fb 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -2,7 +2,7 @@
include(00-Common)
-project(cmake CXX)
+project(cmake)
set(cmake_SOURCE_FILES
CMakeLists.txt
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index b4df171c84..af5c9fb2e7 100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
@@ -2,7 +2,7 @@
# Integration tests of the llimage library (JPEG2000, PNG, jpeg, etc... images reading and writing)
-project (llimage_libtest CXX)
+project (llimage_libtest)
include(00-Common)
include(LLCommon)
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index 9068fa6bb5..91c9f20c10 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -4,7 +4,7 @@
# related to the viewer
if (VIEWER)
-project (llui_libtest CXX)
+project (llui_libtest)
include(00-Common)
include(LLCommon)
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 06b86b8a3b..98ebdc7487 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(linux_crash_logger CXX)
+project(linux_crash_logger)
include(00-Common)
include(GLH)
diff --git a/indra/linux_updater/CMakeLists.txt b/indra/linux_updater/CMakeLists.txt
index 3d314a9826..4377a6333c 100644
--- a/indra/linux_updater/CMakeLists.txt
+++ b/indra/linux_updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(linux_updater CXX)
+project(linux_updater)
include(00-Common)
include(CURL)
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index fc7d1697dd..632e5d46e3 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llaudio CXX)
+project(llaudio)
include(00-Common)
include(Audio)
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index c798804ea4..a1712699eb 100644
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llcharacter CXX)
+project(llcharacter)
include(00-Common)
include(LLCommon)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index b29cd5bb53..dd7b8c6eb8 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -1,7 +1,7 @@
# -*- cmake -*-
-project(llcommon CXX)
+project(llcommon)
include(00-Common)
include(LLCommon)
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt
index bcc32b990a..b2639aec30 100644
--- a/indra/llcrashlogger/CMakeLists.txt
+++ b/indra/llcrashlogger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llcrashlogger CXX)
+project(llcrashlogger)
include(00-Common)
include(LLCommon)
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index e402e27364..ea8c1a1107 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llimage CXX)
+project(llimage)
include(00-Common)
include(LLCommon)
diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index 0976c85130..97d22cf86a 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llimagej2coj CXX)
+project(llimagej2coj)
include(00-Common)
include(LLCommon)
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index dd335e330e..e45c809e7e 100644
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llinventory CXX)
+project(llinventory)
include(00-Common)
include(LLCommon)
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
index 01642e1ea4..bdac2eded7 100644
--- a/indra/llkdu/CMakeLists.txt
+++ b/indra/llkdu/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llkdu CXX)
+project(llkdu)
# Visual Studio 2005 has a dumb bug that causes it to fail compilation
# of KDU if building with both optimisation and /WS (treat warnings as
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
index d4898c49c6..5865ae030c 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llmath CXX)
+project(llmath)
include(00-Common)
include(LLCommon)
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 3f324ae005..d98781e9e6 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llmessage CXX)
+project(llmessage)
include(00-Common)
include(GoogleMock)
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 77906bcf86..1353b7a458 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llplugin CXX)
+project(llplugin)
include(00-Common)
include(CURL)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 31dac53804..3fc54573a7 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(SLPlugin CXX)
+project(SLPlugin)
include(00-Common)
include(LLCommon)
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 061f0df04b..e4d9de7eb6 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llprimitive CXX)
+project(llprimitive)
include(00-Common)
include(LLCommon)
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 25231c2fac..516af93316 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llrender CXX)
+project(llrender)
include(00-Common)
include(FindOpenGL)
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index d737180143..bc225593d8 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llui CXX)
+project(llui)
include(00-Common)
include(LLCommon)
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
index 57352f0900..a819d12861 100644
--- a/indra/llvfs/CMakeLists.txt
+++ b/indra/llvfs/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llvfs CXX)
+project(llvfs)
include(00-Common)
include(LLCommon)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 5600e7d97e..341bddfffd 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -8,7 +8,7 @@
# Unfortunately, the affected code is a rat's nest of #ifdefs, so it's
# easier to play compilation tricks than to actually fix the problem.
-project(llwindow CXX)
+project(llwindow)
include(00-Common)
include(DirectX)
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index da13185318..beefcda361 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llxml CXX)
+project(llxml)
include(00-Common)
include(LLCommon)
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index 4f919b1320..420e836e36 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(mac_crash_logger CXX)
+project(mac_crash_logger)
include(00-Common)
include(LLCommon)
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index 458cfb9754..00dcedecaa 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(mac_updater CXX)
+project(mac_updater)
include(00-Common)
include(OpenSSL)
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index d7815050ff..3ad94b0c64 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_base CXX)
+project(media_plugin_base)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
index 8670dd6e87..54dc5de1ea 100644
--- a/indra/media_plugins/example/CMakeLists.txt
+++ b/indra/media_plugins/example/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_example CXX)
+project(media_plugin_example)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index 9bda543570..5786bd1e25 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_gstreamer010 CXX)
+project(media_plugin_gstreamer010)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt
index 1be6ff5bbc..f0b8f0d167 100644
--- a/indra/media_plugins/quicktime/CMakeLists.txt
+++ b/indra/media_plugins/quicktime/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_quicktime CXX)
+project(media_plugin_quicktime)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index f0591b74fe..b36291f0e8 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_webkit CXX)
+project(media_plugin_webkit)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt
index 3a6f8d2273..bf74f81809 100644
--- a/indra/media_plugins/winmmshim/CMakeLists.txt
+++ b/indra/media_plugins/winmmshim/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(winmm_shim CXX)
+project(winmm_shim)
### winmm_shim
# *HACK - override msvcrt implementation (intialized on 00-Common) to be
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 345c81b838..ec1562a4c1 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(viewer CXX)
+project(viewer)
include(00-Common)
include(Boost)
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 93bde5521b..816f1d7175 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project (test CXX)
+project (test)
include(00-Common)
include(LLCommon)
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index ceaed5a425..1211bb7e5a 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,5 @@
# -*- cmake -*-
-project(llplugintest CXX)
+project(llplugintest)
include(00-Common)
include(FindOpenGL)
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index 102e432284..7720619df3 100644
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(login CXX)
+project(login)
include(00-Common)
if(LL_TESTS)
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
index 48386cb62d..ef82290b47 100644
--- a/indra/viewer_components/updater/CMakeLists.txt
+++ b/indra/viewer_components/updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(updater_service CXX)
+project(updater_service)
include(00-Common)
if(LL_TESTS)
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 9dbcc5758d..5329c89554 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(win_crash_logger CXX)
+project(win_crash_logger)
include(00-Common)
include(LLCommon)
diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt
index d814ddde44..210486c668 100644
--- a/indra/win_updater/CMakeLists.txt
+++ b/indra/win_updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(win_updater CXX)
+project(win_updater)
include(00-Common)
include(LLCommon)