diff options
author | Jacek Antonelli | 2009-11-18 03:01:48 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-11-18 03:01:48 -0600 |
commit | 1f1905c56bbe6225663930e2cab714fb6e60de29 (patch) | |
tree | 729364411d4f34bec27b2f5d8f4cb28c5c0cf5e9 | |
parent | Fixed copyright/licensing info for OpenAL on Mac. (diff) | |
download | meta-impy-1f1905c56bbe6225663930e2cab714fb6e60de29.zip meta-impy-1f1905c56bbe6225663930e2cab714fb6e60de29.tar.gz meta-impy-1f1905c56bbe6225663930e2cab714fb6e60de29.tar.bz2 meta-impy-1f1905c56bbe6225663930e2cab714fb6e60de29.tar.xz |
Silenced some compiler warnings on Linux.
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 24a7cd2..1b761f8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * Silenced some compiler warnings on Linux. | ||
4 | |||
5 | modified: linden/indra/cmake/00-Common.cmake | ||
6 | |||
7 | |||
3 | * Fixed copyright/licensing info for OpenAL on Mac. | 8 | * Fixed copyright/licensing info for OpenAL on Mac. |
4 | 9 | ||
5 | modified: linden/LICENSE-libraries.txt | 10 | modified: linden/LICENSE-libraries.txt |
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 8c6ca2d..9b3f423 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
@@ -112,15 +112,16 @@ if (LINUX) | |||
112 | endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat") | 112 | endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat") |
113 | endif (${GXX_VERSION} STREQUAL ${CXX_VERSION}) | 113 | endif (${GXX_VERSION} STREQUAL ${CXX_VERSION}) |
114 | 114 | ||
115 | # GCC 4.3 introduces a pile of obnoxious new warnings, which we | ||
116 | # treat as errors due to -Werror. Quiet the most offensive and | ||
117 | # widespread of them. | ||
118 | 115 | ||
119 | if (${CXX_VERSION} MATCHES "4.3") | 116 | # Silence certain types of compiler warnings, to prevent them from |
120 | add_definitions(-Wno-deprecated -Wno-parentheses) | 117 | # breaking compile (due to -Werror treating them as errors). |
121 | endif (${CXX_VERSION} MATCHES "4.3") | 118 | |
119 | add_definitions( | ||
120 | -Wno-deprecated | ||
121 | -Wno-parentheses | ||
122 | -Wno-unused-variable | ||
123 | ) | ||
122 | 124 | ||
123 | # End of hacks. | ||
124 | 125 | ||
125 | add_definitions( | 126 | add_definitions( |
126 | -DLL_LINUX=1 | 127 | -DLL_LINUX=1 |