From 51fabc385079a0b5fab4611bb5b16fea5dc26372 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 21 Aug 2012 18:21:11 -0400
Subject: [PATCH] SH-3261 SH-3324 WIP Starting extraction of
wearable/appearance libraries
First pass at cmake configs, and starting to try to move wearable class.
Things are broken, checkpointing work to collaborate.
---
indra/CMakeLists.txt | 1 +
indra/cmake/CMakeLists.txt | 2 +
indra/cmake/LLAppearance.cmake | 7 ++
indra/cmake/Viewer.cmake | 7 ++
indra/llappearance/CMakeLists.txt | 78 +++++++++++++++++++
.../{newview => llappearance}/llwearable.cpp | 36 ++++-----
indra/{newview => llappearance}/llwearable.h | 16 ++--
indra/newview/CMakeLists.txt | 4 +-
8 files changed, 123 insertions(+), 28 deletions(-)
create mode 100644 indra/cmake/LLAppearance.cmake
create mode 100644 indra/cmake/Viewer.cmake
create mode 100644 indra/llappearance/CMakeLists.txt
rename indra/{newview => llappearance}/llwearable.cpp (98%)
rename indra/{newview => llappearance}/llwearable.h (96%)
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 1cebb53a07d..078b17bf53f 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -41,6 +41,7 @@ endif ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${CMAKE_BINARY_DIR}
add_subdirectory(cmake)
add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
+add_subdirectory(${LIBS_OPEN_PREFIX}llappearance)
add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 569034a6fb9..875b5be1526 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -40,6 +40,7 @@ set(cmake_SOURCE_FILES
Hunspell.cmake
JPEG.cmake
LLAddBuildTest.cmake
+ LLAppearance.cmake
LLAudio.cmake
LLCharacter.cmake
LLCommon.cmake
@@ -77,6 +78,7 @@ set(cmake_SOURCE_FILES
Tut.cmake
UI.cmake
UnixInstall.cmake
+ Viewer.cmake
Variables.cmake
XmlRpcEpi.cmake
ZLIB.cmake
diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake
new file mode 100644
index 00000000000..36cebe98165
--- /dev/null
+++ b/indra/cmake/LLAppearance.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLAPPEARANCE_INCLUDE_DIRS
+ ${LIBS_OPEN_DIR}/llappearance
+ )
+
+set(LLAPPEARANCE_LIBRARIES llappearance)
diff --git a/indra/cmake/Viewer.cmake b/indra/cmake/Viewer.cmake
new file mode 100644
index 00000000000..771bb0ed7ae
--- /dev/null
+++ b/indra/cmake/Viewer.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(VIEWER_INCLUDE_DIRS
+ ${LIBS_OPEN_DIR}/newview
+ )
+
+set(VIEWER_LIBRARIES viewer)
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
new file mode 100644
index 00000000000..39bfbc9a210
--- /dev/null
+++ b/indra/llappearance/CMakeLists.txt
@@ -0,0 +1,78 @@
+# -*- cmake -*-
+
+project(llappearance)
+
+include(00-Common)
+include(LLCommon)
+include(Viewer)
+include(LLAudio)
+include(LLCharacter)
+include(LLCommon)
+include(LLImage)
+include(LLImageJ2COJ)
+include(LLInventory)
+include(LLMath)
+include(LLMessage)
+include(LLPhysicsExtensions)
+include(LLPlugin)
+include(LLPrimitive)
+include(LLRender)
+include(LLUI)
+include(LLVFS)
+include(LLWindow)
+include(LLXML)
+include(Linking)
+include(LLKDU)
+include(ViewerMiscLibs)
+include(LLLogin)
+
+include_directories(
+ ${LLCOMMON_INCLUDE_DIRS}
+ ${VIEWER_INCLUDE_DIRS}
+ ${LLAUDIO_INCLUDE_DIRS}
+ ${LLCHARACTER_INCLUDE_DIRS}
+ ${LLCOMMON_INCLUDE_DIRS}
+ ${LLPHYSICS_INCLUDE_DIRS}
+ ${LLIMAGE_INCLUDE_DIRS}
+ ${LLKDU_INCLUDE_DIRS}
+ ${LLINVENTORY_INCLUDE_DIRS}
+ ${LLMATH_INCLUDE_DIRS}
+ ${LLMESSAGE_INCLUDE_DIRS}
+ ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
+ ${LLPLUGIN_INCLUDE_DIRS}
+ ${LLPRIMITIVE_INCLUDE_DIRS}
+ ${LLRENDER_INCLUDE_DIRS}
+ ${LLUI_INCLUDE_DIRS}
+ ${LLVFS_INCLUDE_DIRS}
+ ${LLWINDOW_INCLUDE_DIRS}
+ ${LLXML_INCLUDE_DIRS}
+ ${LLLOGIN_INCLUDE_DIRS}
+ )
+
+set(llappearance_SOURCE_FILES
+ llwearable.cpp
+ )
+
+set(llappearance_HEADER_FILES
+ llwearable.h
+ CMakeLists.txt
+ )
+
+set_source_files_properties(${llappearance_HEADER_FILES}
+ PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llappearance_SOURCE_FILES ${llappearance_HEADER_FILES})
+
+add_library (llappearance ${llappearance_SOURCE_FILES})
+
+#add unit tests
+#if (LL_TESTS)
+# INCLUDE(LLAddBuildTest)
+# SET(llappearance_TEST_SOURCE_FILES
+# # no real unit tests yet!
+# )
+# LL_ADD_PROJECT_UNIT_TESTS(llappearance "${llappearance_TEST_SOURCE_FILES}")
+
+ #set(TEST_DEBUG on)
+# set(test_libs llappearance ${LLCOMMON_LIBRARIES})
+#endif (LL_TESTS)
diff --git a/indra/newview/llwearable.cpp b/indra/llappearance/llwearable.cpp
similarity index 98%
rename from indra/newview/llwearable.cpp
rename to indra/llappearance/llwearable.cpp
index 402504933cd..d72999d8c78 100644
--- a/indra/newview/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -24,29 +24,29 @@
* $/LicenseInfo$
*/
-#include "llviewerprecompiledheaders.h"
+//#include "llviewerprecompiledheaders.h"
-#include "llagent.h"
-#include "llagentcamera.h"
+//#include "llagent.h"
+//#include "llagentcamera.h"
#include "llagentwearables.h"
-#include "lldictionary.h"
-#include "llfloatersidepanelcontainer.h"
-#include "lllocaltextureobject.h"
-#include "llnotificationsutil.h"
-#include "llviewertexturelist.h"
-#include "llinventorymodel.h"
-#include "llinventoryobserver.h"
-#include "llsidepanelappearance.h"
+//#include "lldictionary.h"
+//#include "llfloatersidepanelcontainer.h"
+//#include "lllocaltextureobject.h"
+//#include "llnotificationsutil.h"
+//#include "llviewertexturelist.h"
+//#include "llinventorymodel.h"
+//#include "llinventoryobserver.h"
+//#include "llsidepanelappearance.h"
#include "lltexlayer.h"
-#include "lltexglobalcolor.h"
-#include "lltrans.h"
-#include "llviewerregion.h"
+//#include "lltexglobalcolor.h"
+//#include "lltrans.h"
+//#include "llviewerregion.h"
#include "llvisualparam.h"
-#include "llvoavatar.h"
-#include "llvoavatarself.h"
-#include "llvoavatardefines.h"
+//#include "llvoavatar.h"
+//#include "llvoavatarself.h"
+//#include "llvoavatardefines.h"
#include "llwearable.h"
-#include "llviewercontrol.h"
+//#include "llviewercontrol.h"
using namespace LLVOAvatarDefines;
diff --git a/indra/newview/llwearable.h b/indra/llappearance/llwearable.h
similarity index 96%
rename from indra/newview/llwearable.h
rename to indra/llappearance/llwearable.h
index 3d8c53a755c..c8f9ef1fb94 100644
--- a/indra/newview/llwearable.h
+++ b/indra/llappearance/llwearable.h
@@ -27,14 +27,14 @@
#ifndef LL_LLWEARABLE_H
#define LL_LLWEARABLE_H
-#include "lluuid.h"
-#include "llstring.h"
-#include "llpermissions.h"
-#include "llsaleinfo.h"
-#include "llassetstorage.h"
-#include "llwearabletype.h"
-#include "llfile.h"
-#include "lllocaltextureobject.h"
+//#include "lluuid.h"
+//#include "llstring.h"
+//#include "llpermissions.h"
+//#include "llsaleinfo.h"
+//#include "llassetstorage.h"
+//#include "llwearabletype.h"
+//#include "llfile.h"
+//#include "lllocaltextureobject.h"
class LLViewerInventoryItem;
class LLVisualParam;
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2c9952cbc8e..ff3fb0038cf 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -44,6 +44,7 @@ include(LLLogin)
include(VisualLeakDetector)
include(GLOD)
include(CMakeCopyIfDifferent)
+include(LLAppearance)
add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions)
@@ -77,6 +78,7 @@ include_directories(
${LIBS_PREBUILD_DIR}/include/hunspell
${OPENAL_LIB_INCLUDE_DIRS}
${LIBS_PREBUILT_DIR}/include/collada/1.4
+ ${LLAPPEARANCE_INCLUDE_DIRS}
)
set(viewer_SOURCE_FILES
@@ -625,7 +627,6 @@ set(viewer_SOURCE_FILES
llwatchdog.cpp
llwaterparammanager.cpp
llwaterparamset.cpp
- llwearable.cpp
llwearableitemslist.cpp
llwearablelist.cpp
llwearabletype.cpp
@@ -1194,7 +1195,6 @@ set(viewer_HEADER_FILES
llwatchdog.h
llwaterparammanager.h
llwaterparamset.h
- llwearable.h
llwearableitemslist.h
llwearablelist.h
llwearabletype.h
--
GitLab