From c136b432140f892a56d4996d5ed77e903ff0b32d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 15 Nov 2012 19:46:09 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system eliminated min and
max macros from windows.h got rest of viewer to compile against llfasttimer
changes
---
indra/cmake/00-Common.cmake | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 21cb87237d..180714c9c9 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -58,6 +58,7 @@ if (WINDOWS)
add_definitions(
/DLL_WINDOWS=1
+ /DNOMINMAX
/DDOM_DYNAMIC
/DUNICODE
/D_UNICODE
--
cgit v1.2.3
From 019836a39667889d4347277cde82270113992bb6 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Fri, 4 Jan 2013 03:02:54 +0000
Subject: More fixes for linux build of lltrace changes
---
indra/cmake/00-Common.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index d9553b9a7e..af3689c641 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -216,7 +216,7 @@ endif (DARWIN)
if (LINUX OR DARWIN)
- set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
+ set(GCC_WARNINGS "-Wall -Wno-unused-but-set-variable -Wno-sign-compare -Wno-trigraphs")
if (NOT GCC_DISABLE_FATAL_WARNINGS)
set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
--
cgit v1.2.3
From 7b0762984a4c49595445ed3a5a113c3f0aa17181 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Thu, 10 Jan 2013 08:54:38 +0000
Subject: removed compiler flag not understood by OS X version of gcc
---
indra/cmake/00-Common.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index af3689c641..d9553b9a7e 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -216,7 +216,7 @@ endif (DARWIN)
if (LINUX OR DARWIN)
- set(GCC_WARNINGS "-Wall -Wno-unused-but-set-variable -Wno-sign-compare -Wno-trigraphs")
+ set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
if (NOT GCC_DISABLE_FATAL_WARNINGS)
set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
--
cgit v1.2.3
From 516061275bae539218b603b350d3afd1cce858c9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 9 Jan 2014 12:18:34 -0800
Subject: fixed unit tests being generated as Windows GUI projects instead of
console projects
---
indra/cmake/LLAddBuildTest.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9bb3077797..068aeea212 100755
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -211,7 +211,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
if (WINDOWS)
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
PROPERTIES
- LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS"
+ LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
LINK_FLAGS_RELEASE ""
)
--
cgit v1.2.3