From 8c289ec126edf510a542c86e4c9df1787a37acb6 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Fri, 11 Sep 2020 10:00:17 -0700
Subject: Effective rename of DRTVWR-506-simple since there is no way to rename
a branch. Cloned canonical viewer into DRTVWR-519, copied over the files that
changed from DRTVWR-506-simple and pushed back. Once I am satisfied
everything is correct, DRTVWR-506-simple will be removed
---
indra/cmake/00-Common.cmake | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 865c057e33..9f8ee34034 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -63,8 +63,14 @@ if (WINDOWS)
# Without PreferredToolArchitecture=x64, as of 2020-06-26 the 32-bit
# compiler on our TeamCity build hosts has started running out of virtual
# memory for the precompiled header file.
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64")
-
+ # CP changed to only append the flag for 32bit builds - on 64bit builds,
+ # locally at least, the build output is spammed with 1000s of 'D9002'
+ # warnings about this switch being ignored.
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+ if( ADDRESS_SIZE EQUAL 32 )
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")
+ endif()
+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo"
CACHE STRING "C++ compiler release-with-debug options" FORCE)
--
cgit v1.2.3
From 3fc07dea01795b31c37dcd093ec73d190a1e188a Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Wed, 16 Sep 2020 18:53:24 -0700
Subject: First part of change to remove LLVFS from the Viewer. Consists of
code changes to remove LLVFS and LLVFSThread classes along with the
associated source files. The existing llvfs folder is renamed to llcache.
Also includes changes to CMake script in many places to reflect changes.
Eventually, llvfile source file and class will be renamed but that is not in
this change.
---
indra/cmake/CMakeLists.txt | 2 +-
indra/cmake/LLCache.cmake | 7 +++++++
indra/cmake/LLVFS.cmake | 7 -------
3 files changed, 8 insertions(+), 8 deletions(-)
create mode 100644 indra/cmake/LLCache.cmake
delete mode 100644 indra/cmake/LLVFS.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index a17e37cd32..d464c8ad74 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -69,7 +69,7 @@ set(cmake_SOURCE_FILES
LLSharedLibs.cmake
LLTestCommand.cmake
LLUI.cmake
- LLVFS.cmake
+ LLCache.cmake
LLWindow.cmake
LLXML.cmake
Linking.cmake
diff --git a/indra/cmake/LLCache.cmake b/indra/cmake/LLCache.cmake
new file mode 100644
index 0000000000..6a82774133
--- /dev/null
+++ b/indra/cmake/LLCache.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLCACHE_INCLUDE_DIRS
+ ${LIBS_OPEN_DIR}/llcache
+ )
+
+set(LLCACHE_LIBRARIES llcache)
diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake
deleted file mode 100644
index 0fe87cdea6..0000000000
--- a/indra/cmake/LLVFS.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLVFS_INCLUDE_DIRS
- ${LIBS_OPEN_DIR}/llvfs
- )
-
-set(LLVFS_LIBRARIES llvfs)
--
cgit v1.2.3
From d9448c6f52218146113d1d5c5ca4c4d5f01dc5cf Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Thu, 17 Sep 2020 09:45:06 -0700
Subject: The folder where the disk cache lives was originally renamed from
llvfs to llcache but @henri's suggestion that that doesn't reflect the other
files in the same place and it should be llfilesystem is a good one so I
changed it over
---
indra/cmake/CMakeLists.txt | 2 +-
indra/cmake/LLCache.cmake | 7 -------
indra/cmake/LLFileSystem.cmake | 7 +++++++
3 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 indra/cmake/LLCache.cmake
create mode 100644 indra/cmake/LLFileSystem.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index d464c8ad74..352dfc0641 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -69,7 +69,7 @@ set(cmake_SOURCE_FILES
LLSharedLibs.cmake
LLTestCommand.cmake
LLUI.cmake
- LLCache.cmake
+ LLFileSystem.cmake
LLWindow.cmake
LLXML.cmake
Linking.cmake
diff --git a/indra/cmake/LLCache.cmake b/indra/cmake/LLCache.cmake
deleted file mode 100644
index 6a82774133..0000000000
--- a/indra/cmake/LLCache.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLCACHE_INCLUDE_DIRS
- ${LIBS_OPEN_DIR}/llcache
- )
-
-set(LLCACHE_LIBRARIES llcache)
diff --git a/indra/cmake/LLFileSystem.cmake b/indra/cmake/LLFileSystem.cmake
new file mode 100644
index 0000000000..2e6c42c30c
--- /dev/null
+++ b/indra/cmake/LLFileSystem.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLFILESYSTEM_INCLUDE_DIRS
+ ${LIBS_OPEN_DIR}/llfilesystem
+ )
+
+set(LLFILESYSTEM_LIBRARIES llfilesystem)
--
cgit v1.2.3
From 5858bb87c7d9d222e61c7c4f7f0f1dc8ba02c77f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Tue, 22 Sep 2020 16:52:10 -0700
Subject: Add SQLite third package to this viewer and pull in the most recent
build (3.33)
---
indra/cmake/SQLite.cmake | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 indra/cmake/SQLite.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/SQLite.cmake b/indra/cmake/SQLite.cmake
new file mode 100644
index 0000000000..3571ca7d1e
--- /dev/null
+++ b/indra/cmake/SQLite.cmake
@@ -0,0 +1,11 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (USESYSTEMLIBS)
+ include(FindPkgConfig)
+ pkg_check_modules(SQLITE REQUIRED sqlite3)
+else (USESYSTEMLIBS)
+ use_prebuilt_binary(sqlite)
+ set(SQLITE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/sqlite/)
+ set(SQLITE_LIBRARIES sqlite)
+endif (USESYSTEMLIBS)
--
cgit v1.2.3
From 56e30615530bf5d1c86fbafee89c9998a079e88f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Tue, 6 Oct 2020 17:20:08 -0700
Subject: Remove SQLite from project and we are now not going to use it for the
cache
---
indra/cmake/SQLite.cmake | 11 -----------
1 file changed, 11 deletions(-)
delete mode 100644 indra/cmake/SQLite.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/SQLite.cmake b/indra/cmake/SQLite.cmake
deleted file mode 100644
index 3571ca7d1e..0000000000
--- a/indra/cmake/SQLite.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (USESYSTEMLIBS)
- include(FindPkgConfig)
- pkg_check_modules(SQLITE REQUIRED sqlite3)
-else (USESYSTEMLIBS)
- use_prebuilt_binary(sqlite)
- set(SQLITE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/sqlite/)
- set(SQLITE_LIBRARIES sqlite)
-endif (USESYSTEMLIBS)
--
cgit v1.2.3