summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
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 1cebb53a07..1b1756d2db 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})
+project(${ROOT_PROJECT_NAME} CXX)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 569034a6fb..548f4d1682 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -2,7 +2,7 @@
include(00-Common)
-project(cmake)
+project(cmake CXX)
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 af5c9fb2e7..b4df171c84 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)
+project (llimage_libtest CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index 91c9f20c10..9068fa6bb5 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)
+project (llui_libtest CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 98ebdc7487..06b86b8a3b 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(linux_crash_logger)
+project(linux_crash_logger CXX)
include(00-Common)
include(GLH)
diff --git a/indra/linux_updater/CMakeLists.txt b/indra/linux_updater/CMakeLists.txt
index 4377a6333c..3d314a9826 100644
--- a/indra/linux_updater/CMakeLists.txt
+++ b/indra/linux_updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(linux_updater)
+project(linux_updater CXX)
include(00-Common)
include(CURL)
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 632e5d46e3..fc7d1697dd 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llaudio)
+project(llaudio CXX)
include(00-Common)
include(Audio)
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index a1712699eb..c798804ea4 100644
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llcharacter)
+project(llcharacter CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index dd7b8c6eb8..b29cd5bb53 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -1,7 +1,7 @@
# -*- cmake -*-
-project(llcommon)
+project(llcommon CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt
index b2639aec30..bcc32b990a 100644
--- a/indra/llcrashlogger/CMakeLists.txt
+++ b/indra/llcrashlogger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llcrashlogger)
+project(llcrashlogger CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index ea8c1a1107..e402e27364 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llimage)
+project(llimage CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index 97d22cf86a..0976c85130 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llimagej2coj)
+project(llimagej2coj CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index e45c809e7e..dd335e330e 100644
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llinventory)
+project(llinventory CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
index bdac2eded7..01642e1ea4 100644
--- a/indra/llkdu/CMakeLists.txt
+++ b/indra/llkdu/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llkdu)
+project(llkdu CXX)
# 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 5865ae030c..d4898c49c6 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llmath)
+project(llmath CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index d98781e9e6..3f324ae005 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llmessage)
+project(llmessage CXX)
include(00-Common)
include(GoogleMock)
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 1353b7a458..77906bcf86 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llplugin)
+project(llplugin CXX)
include(00-Common)
include(CURL)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 3fc54573a7..31dac53804 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(SLPlugin)
+project(SLPlugin CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index e4d9de7eb6..061f0df04b 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llprimitive)
+project(llprimitive CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 516af93316..25231c2fac 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llrender)
+project(llrender CXX)
include(00-Common)
include(FindOpenGL)
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index bc225593d8..d737180143 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llui)
+project(llui CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
index a819d12861..57352f0900 100644
--- a/indra/llvfs/CMakeLists.txt
+++ b/indra/llvfs/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llvfs)
+project(llvfs CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 341bddfffd..5600e7d97e 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)
+project(llwindow CXX)
include(00-Common)
include(DirectX)
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index beefcda361..da13185318 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(llxml)
+project(llxml CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index 420e836e36..4f919b1320 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(mac_crash_logger)
+project(mac_crash_logger CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index 00dcedecaa..458cfb9754 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(mac_updater)
+project(mac_updater CXX)
include(00-Common)
include(OpenSSL)
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 3ad94b0c64..d7815050ff 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_base)
+project(media_plugin_base CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
index 54dc5de1ea..8670dd6e87 100644
--- a/indra/media_plugins/example/CMakeLists.txt
+++ b/indra/media_plugins/example/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_example)
+project(media_plugin_example CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index 5786bd1e25..9bda543570 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_gstreamer010)
+project(media_plugin_gstreamer010 CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt
index f0b8f0d167..1be6ff5bbc 100644
--- a/indra/media_plugins/quicktime/CMakeLists.txt
+++ b/indra/media_plugins/quicktime/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_quicktime)
+project(media_plugin_quicktime CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index b36291f0e8..f0591b74fe 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(media_plugin_webkit)
+project(media_plugin_webkit CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt
index bf74f81809..3a6f8d2273 100644
--- a/indra/media_plugins/winmmshim/CMakeLists.txt
+++ b/indra/media_plugins/winmmshim/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(winmm_shim)
+project(winmm_shim CXX)
### 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 ec1562a4c1..345c81b838 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(viewer)
+project(viewer CXX)
include(00-Common)
include(Boost)
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 816f1d7175..93bde5521b 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project (test)
+project (test CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 1211bb7e5a..ceaed5a425 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,5 @@
# -*- cmake -*-
-project(llplugintest)
+project(llplugintest CXX)
include(00-Common)
include(FindOpenGL)
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index 7720619df3..102e432284 100644
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(login)
+project(login CXX)
include(00-Common)
if(LL_TESTS)
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
index ef82290b47..48386cb62d 100644
--- a/indra/viewer_components/updater/CMakeLists.txt
+++ b/indra/viewer_components/updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(updater_service)
+project(updater_service CXX)
include(00-Common)
if(LL_TESTS)
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 5329c89554..9dbcc5758d 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(win_crash_logger)
+project(win_crash_logger CXX)
include(00-Common)
include(LLCommon)
diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt
index 210486c668..d814ddde44 100644
--- a/indra/win_updater/CMakeLists.txt
+++ b/indra/win_updater/CMakeLists.txt
@@ -1,6 +1,6 @@
# -*- cmake -*-
-project(win_updater)
+project(win_updater CXX)
include(00-Common)
include(LLCommon)