From 97c954dd84d50ec7b739d2dd3adb7365589f3034 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 6 Jul 2021 21:26:15 +0300
Subject: SL-15522 Initial addition of meshoptimizer
---
indra/cmake/CMakeLists.txt | 1 +
indra/cmake/LLMeshOptimizer.cmake | 7 +++++++
indra/cmake/MESHOPTIMIZER.cmake | 16 ++++++++++++++++
3 files changed, 24 insertions(+)
create mode 100644 indra/cmake/LLMeshOptimizer.cmake
create mode 100644 indra/cmake/MESHOPTIMIZER.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index a17e37cd32..7795aa7db1 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -61,6 +61,7 @@ set(cmake_SOURCE_FILES
LLKDU.cmake
LLLogin.cmake
LLMath.cmake
+ LLMeshOptimizer.cmake
LLMessage.cmake
LLPhysicsExtensions.cmake
LLPlugin.cmake
diff --git a/indra/cmake/LLMeshOptimizer.cmake b/indra/cmake/LLMeshOptimizer.cmake
new file mode 100644
index 0000000000..b79944f618
--- /dev/null
+++ b/indra/cmake/LLMeshOptimizer.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLMESHOPTIMIZER_INCLUDE_DIRS
+ ${LIBS_OPEN_DIR}/llmeshoptimizer
+ )
+
+set(LLMESHOPTIMIZER_LIBRARIES llmeshoptimizer)
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/MESHOPTIMIZER.cmake
new file mode 100644
index 0000000000..7600a56999
--- /dev/null
+++ b/indra/cmake/MESHOPTIMIZER.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+use_prebuilt_binary(meshoptimizer)
+
+if (WINDOWS)
+ set(MESHOPTIMIZER_LIBRARIES
+ debug meshoptimizer
+ optimized meshoptimizer)
+elseif (LINUX)
+ set(MESHOPTIMIZER_LIBRARIES meshoptimizer)
+elseif (DARWIN)
+ set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.o)
+endif (WINDOWS)
+set(MESHOPTIMIZER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
--
cgit v1.2.3
From 1a17e19a610b598650624fb0ae3e67352f00e499 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 8 Jul 2021 20:29:28 +0300
Subject: DRTVWR-542 WIP #2
---
indra/cmake/CMakeLists.txt | 1 +
indra/cmake/MESHOPTIMIZER.cmake | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 7795aa7db1..527a9cba43 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -75,6 +75,7 @@ set(cmake_SOURCE_FILES
LLXML.cmake
Linking.cmake
MediaPluginBase.cmake
+ MESHOPTIMIZER.cmake
NDOF.cmake
OPENAL.cmake
OpenGL.cmake
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/MESHOPTIMIZER.cmake
index 7600a56999..6a31dc5569 100644
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ b/indra/cmake/MESHOPTIMIZER.cmake
@@ -1,16 +1,16 @@
# -*- cmake -*-
+include(Linking)
include(Prebuilt)
use_prebuilt_binary(meshoptimizer)
if (WINDOWS)
- set(MESHOPTIMIZER_LIBRARIES
- debug meshoptimizer
- optimized meshoptimizer)
+ set(MESHOPTIMIZER_LIBRARIES meshoptimizer.lib)
elseif (LINUX)
- set(MESHOPTIMIZER_LIBRARIES meshoptimizer)
+ set(MESHOPTIMIZER_LIBRARIES meshoptimizer.o)
elseif (DARWIN)
set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.o)
endif (WINDOWS)
+
set(MESHOPTIMIZER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
--
cgit v1.2.3
From eb13133e3e0020c73399414cea4d9b39ef526cd3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 12 Jul 2021 16:47:45 +0300
Subject: DRTVWR-542 WIP #5
---
indra/cmake/MESHOPTIMIZER.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/MESHOPTIMIZER.cmake
index 6a31dc5569..1c5b47b9bd 100644
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ b/indra/cmake/MESHOPTIMIZER.cmake
@@ -10,7 +10,7 @@ if (WINDOWS)
elseif (LINUX)
set(MESHOPTIMIZER_LIBRARIES meshoptimizer.o)
elseif (DARWIN)
- set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.o)
+ set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.a)
endif (WINDOWS)
set(MESHOPTIMIZER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
--
cgit v1.2.3
From 1a782ed690e56bf81ec9073041c7559e1762855d Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Mon, 19 Jul 2021 16:26:33 -0600
Subject: SL-15595 update viewer autobuild to import tracy lib
---
indra/cmake/Tracy.cmake | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 indra/cmake/Tracy.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
new file mode 100644
index 0000000000..bf09bccd4b
--- /dev/null
+++ b/indra/cmake/Tracy.cmake
@@ -0,0 +1,17 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(TRACY ON CACHE BOOL "Use Tracy profiler.")
+
+if (TRACY)
+ set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
+ if (WINDOWS)
+ use_prebuilt_binary(tracy)
+ set(TRACY_LIBRARY tracy)
+ else (WINDOWS)
+ set(TRACY_LIBRARY "")
+ endif (WINDOWS)
+else (TRACY)
+ set(TRACY_LIBRARY "")
+endif (TRACY)
+
--
cgit v1.2.3
From 7d5cd52498e3da2b2438ad82fe450c923541e798 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Tue, 27 Jul 2021 15:31:15 -0700
Subject: SL-15709: Add Tracy support to viewer
---
indra/cmake/LLCommon.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 8900419f9b..c1cfa51cfb 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -30,7 +30,7 @@ else (LINUX)
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
- ${BOOST_SYSTEM_LIBRARY} )
+ ${BOOST_SYSTEM_LIBRARY})
endif (LINUX)
set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.")
--
cgit v1.2.3
From 574b05531ce3a0e535264937d299e5580fb31cdc Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Thu, 26 Aug 2021 22:50:08 -0700
Subject: SL-15709: Default Tracy to off
---
indra/cmake/Tracy.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index bf09bccd4b..f4be4f72b3 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -1,7 +1,7 @@
# -*- cmake -*-
include(Prebuilt)
-set(TRACY ON CACHE BOOL "Use Tracy profiler.")
+set(TRACY OFF CACHE BOOL "Use Tracy profiler.")
if (TRACY)
set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
--
cgit v1.2.3
From bb601196ddbe7d37584468f611ada67647a050d3 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Thu, 26 Aug 2021 22:52:07 -0700
Subject: SL-15709: IF Tracy is enabled default to using only Tracy instead of
Fast Timers; also print Tracy include directory
---
indra/cmake/Tracy.cmake | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index f4be4f72b3..4750bdc349 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -5,12 +5,25 @@ set(TRACY OFF CACHE BOOL "Use Tracy profiler.")
if (TRACY)
set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
+
+# See: indra/llcommon/llprofiler.h
+ add_definitions(-DLL_PROFILER_CONFIGURATION=2)
+ use_prebuilt_binary(tracy)
+
if (WINDOWS)
- use_prebuilt_binary(tracy)
+ MESSAGE(STATUS "Including Tracy for Windows: '${TRACY_INCLUDE_DIR}'")
set(TRACY_LIBRARY tracy)
- else (WINDOWS)
- set(TRACY_LIBRARY "")
endif (WINDOWS)
+
+ if (DARWIN)
+ MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'")
+ set(TRACY_LIBRARY "")
+ endif (DARWIN)
+
+ if (LINUX)
+ MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'")
+ set(TRACY_LIBRARY "")
+ endif (LINUX)
else (TRACY)
set(TRACY_LIBRARY "")
endif (TRACY)
--
cgit v1.2.3
From 240000c01cb6dc43203584809eb63452b3c80b75 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Tue, 31 Aug 2021 21:23:10 -0700
Subject: SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if
Tracy not enabled
---
indra/cmake/Tracy.cmake | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index 4750bdc349..dfa3e83039 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -1,9 +1,9 @@
# -*- cmake -*-
include(Prebuilt)
-set(TRACY OFF CACHE BOOL "Use Tracy profiler.")
+set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
-if (TRACY)
+if (USE_TRACY)
set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
# See: indra/llcommon/llprofiler.h
@@ -24,7 +24,9 @@ if (TRACY)
MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'")
set(TRACY_LIBRARY "")
endif (LINUX)
-else (TRACY)
+else (USE_TRACY)
+ # Tracy.cmake should not set LLCOMMON_INCLUDE_DIRS, let LLCommon.cmake do that
+ set(TRACY_INCLUDE_DIR "")
set(TRACY_LIBRARY "")
-endif (TRACY)
+endif (USE_TRACY)
--
cgit v1.2.3
From 3176136686adb58f4add432b017a7017a3f405a5 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Tue, 31 Aug 2021 21:41:03 -0700
Subject: SL-15709: Fix LLCommon not setting Tracy include directory and not
linking to tracy.lib
---
indra/cmake/LLCommon.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index c1cfa51cfb..b6f310fe12 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -3,12 +3,14 @@
include(APR)
include(Boost)
include(EXPAT)
+include(Tracy)
include(ZLIB)
set(LLCOMMON_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llcommon
${APRUTIL_INCLUDE_DIR}
${APR_INCLUDE_DIR}
+ ${TRACY_INCLUDE_DIR}
)
set(LLCOMMON_SYSTEM_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
@@ -30,7 +32,9 @@ else (LINUX)
${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
- ${BOOST_SYSTEM_LIBRARY})
+ ${BOOST_SYSTEM_LIBRARY}
+ ${TRACY_LIBRARY}
+ )
endif (LINUX)
set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.")
--
cgit v1.2.3
From c37cc7c3a4888fdca132613d627d7ad90517332a Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Fri, 3 Sep 2021 17:20:22 -0700
Subject: SL-15709: Windows: Include Tracy source directly; don't use a library
---
indra/cmake/LLCommon.cmake | 1 -
indra/cmake/Tracy.cmake | 3 ---
2 files changed, 4 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index b6f310fe12..34499aaa36 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -33,7 +33,6 @@ else (LINUX)
${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
- ${TRACY_LIBRARY}
)
endif (LINUX)
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index dfa3e83039..1b8c3db2e2 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -12,17 +12,14 @@ if (USE_TRACY)
if (WINDOWS)
MESSAGE(STATUS "Including Tracy for Windows: '${TRACY_INCLUDE_DIR}'")
- set(TRACY_LIBRARY tracy)
endif (WINDOWS)
if (DARWIN)
MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'")
- set(TRACY_LIBRARY "")
endif (DARWIN)
if (LINUX)
MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'")
- set(TRACY_LIBRARY "")
endif (LINUX)
else (USE_TRACY)
# Tracy.cmake should not set LLCOMMON_INCLUDE_DIRS, let LLCommon.cmake do that
--
cgit v1.2.3
From b4bb74c5def3175d99d672b0b26f941b756f5f45 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 22 Sep 2021 21:37:01 +0000
Subject: SL-16031 Add support for VS 2019 (requires autobuild 1.2-alpha)
---
indra/cmake/Copy3rdPartyLibs.cmake | 2 ++
1 file changed, 2 insertions(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 46ddb9d15b..75601ddfcb 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -97,6 +97,8 @@ if(WINDOWS)
set(MSVC_VER 120)
elseif (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) # Visual Studio 2017
set(MSVC_VER 140)
+ elseif (MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930) # Visual Studio 2019
+ set(MSVC_VER 140)
else (MSVC80)
MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
endif (MSVC80)
--
cgit v1.2.3
From d2dce17803a545378407d6b7c62fdcd3007a92bc Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 19 Oct 2021 02:26:41 +0000
Subject: SL-16197 Optimize LLEnvironment handling of shader uniforms.
Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast
Timer overhead.
---
indra/cmake/Tracy.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index 1b8c3db2e2..cfff956bcf 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -7,7 +7,7 @@ if (USE_TRACY)
set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy)
# See: indra/llcommon/llprofiler.h
- add_definitions(-DLL_PROFILER_CONFIGURATION=2)
+ add_definitions(-DLL_PROFILER_CONFIGURATION=3)
use_prebuilt_binary(tracy)
if (WINDOWS)
--
cgit v1.2.3
From 33f52ee51dad85802d124e987aa6ee9b7faf0cb2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Nov 2021 17:48:55 +0200
Subject: SL-14403 Removed glod
---
indra/cmake/CMakeLists.txt | 1 -
indra/cmake/Copy3rdPartyLibs.cmake | 3 ---
indra/cmake/GLOD.cmake | 9 ---------
3 files changed, 13 deletions(-)
delete mode 100644 indra/cmake/GLOD.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 9c497001c7..78d8652394 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -40,7 +40,6 @@ set(cmake_SOURCE_FILES
FreeType.cmake
GLEXT.cmake
GLH.cmake
- GLOD.cmake
## GStreamer010Plugin.cmake
GoogleMock.cmake
Havok.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index b20d23cead..336896ed01 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -57,7 +57,6 @@ if(WINDOWS)
libaprutil-1.dll
libapriconv-1.dll
nghttp2.dll
- glod.dll
libhunspell.dll
uriparser.dll
)
@@ -166,7 +165,6 @@ elseif(DARWIN)
libaprutil-1.0.dylib
libaprutil-1.dylib
${EXPAT_COPY}
- libGLOD.dylib
libhunspell-1.3.0.dylib
libndofdev.dylib
libnghttp2.dylib
@@ -215,7 +213,6 @@ elseif(LINUX)
${EXPAT_COPY}
libfreetype.so.6.6.2
libfreetype.so.6
- libGLOD.so
libgmodule-2.0.so
libgobject-2.0.so
libhunspell-1.3.so.0.0.0
diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake
deleted file mode 100644
index a347eb6fee..0000000000
--- a/indra/cmake/GLOD.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (NOT USESYSTEMLIBS)
- use_prebuilt_binary(glod)
-endif (NOT USESYSTEMLIBS)
-
-set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-set(GLOD_LIBRARIES GLOD)
--
cgit v1.2.3
From aeed774ff9cc55c0c1dd2784e23b2366ff367fbe Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Thu, 15 Apr 2021 09:46:31 -0600
Subject: (Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition
(/Zo)
---
indra/cmake/00-Common.cmake | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 8aea50e02b..7c9e07b099 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -42,8 +42,8 @@ if(NON_RELEASE_CRASH_REPORTING)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLL_SEND_CRASH_REPORTS=1")
endif()
-# Don't bother with a MinSizeRel build.
-set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
+# Don't bother with MinSizeRel or Debug builds.
+set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release" CACHE STRING
"Supported build types." FORCE)
@@ -70,13 +70,18 @@ if (WINDOWS)
if( ADDRESS_SIZE EQUAL 32 )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")
endif()
+
+ # Preserve first-pass-through versions (ie no FORCE overwrite). Prevents recursive addition of /Zo (04/2021)
+ set(OG_CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} CACHE STRING "OG_CXX_FLAGS_RELEASE")
+ set(OG_CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} CACHE STRING "OG_CXX_FLAGS_RELWITHDEBINFO")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo"
+ "${OG_CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo"
CACHE STRING "C++ compiler release-with-debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE
- "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /Zo"
+ "${OG_CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /Zo"
CACHE STRING "C++ compiler release options" FORCE)
+
# zlib has assembly-language object files incompatible with SAFESEH
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099")
--
cgit v1.2.3
From 4745aab37647956cf92e760df525d5fe64f47908 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Tue, 16 Nov 2021 12:17:36 -0700
Subject: DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac
build)
---
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 7c9e07b099..bf54b655c2 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -81,7 +81,7 @@ if (WINDOWS)
set(CMAKE_CXX_FLAGS_RELEASE
"${OG_CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /Zo"
CACHE STRING "C++ compiler release options" FORCE)
-
+
# zlib has assembly-language object files incompatible with SAFESEH
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099")
--
cgit v1.2.3
From c0adc5e18106077eaf021599b80a822f7063df01 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 7 May 2022 01:55:41 +0300
Subject: SL-17376 Fix viewer failing due to missing vcruntime140_1
---
indra/cmake/Copy3rdPartyLibs.cmake | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index b408702f04..ff705101de 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -129,6 +129,7 @@ if(WINDOWS)
msvcp${MSVC_VER}.dll
msvcr${MSVC_VER}.dll
vcruntime${MSVC_VER}.dll
+ vcruntime${MSVC_VER}_1.dll
)
if(EXISTS "${registry_path}/${release_msvc_file}")
to_staging_dirs(
--
cgit v1.2.3