From 728e2c6e70c7eddb0003d75ee81103aa6c540a8a Mon Sep 17 00:00:00 2001
From: Paul Oppenheim <poppy@lindenlab.com>
Date: Mon, 18 Aug 2008 08:09:52 +0000
Subject: [PATCH] fix for DEV-18488 - remove optimization for RelWithDebInfo
for Darwin builds. Not reviewed, mailed to cmake@. Pretty minor, not
destructive. Also removing test lldatabase_tut on mac for DEV-14371 until
theres a sane way to do connection checking. I could be wrong on this one.
---
indra/cmake/00-Common.cmake | 4 ++++
indra/test/CMakeLists.txt | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 1d697deeae4..5cacd459e99 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -164,6 +164,10 @@ if (DARWIN)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+ # NOTE: it's critical that the optimization flag is put in front.
+ # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endif (DARWIN)
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 37ad170467a..6940c0682ff 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -30,7 +30,6 @@ set(test_SOURCE_FILES
llbase64_tut.cpp
llblowfish_tut.cpp
llbuffer_tut.cpp
- lldatabase_tut.cpp
lldate_tut.cpp
llerror_tut.cpp
llhost_tut.cpp
@@ -89,6 +88,12 @@ if (NOT WINDOWS)
)
endif (NOT WINDOWS)
+if (NOT DARWIN)
+ list(APPEND test_SOURCE_FILES
+ lldatabase_tut.cpp
+ )
+endif (NOT DARWIN)
+
set_source_files_properties(${test_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
--
GitLab