Major breaking changes

2016-01-16 08:05:47 -05:00
parent 05ec61d0b0
commit 2f2e1fbe8f
94 changed files with 5594 additions and 6149 deletions
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -1,18 +1,25 @@
 # -*- cmake -*-

+# these should be moved to their own cmake file
+include(Prebuilt)
+include(Boost)
 include(Colladadom)

+
+use_prebuilt_binary(libxml2)
+
 set(LLPRIMITIVE_INCLUDE_DIRS
  ${LIBS_OPEN_DIR}/llprimitive
  ${COLLADADOM_INCLUDE_DIRS}
  )

 if (WINDOWS)
-  set(LLPRIMITIVE_LIBRARIES 
-	  debug llprimitive
-	  optimized llprimitive
-	  ${COLLADADOM_LIBRARIES}
-	  )
+    set(LLPRIMITIVE_LIBRARIES
+        llprimitive
+        ${COLLADADOM_LIBRARIES}
+        libxml2_a
+        ${BOOST_SYSTEM_LIBRARIES}
+        )
 else (WINDOWS)
  set(LLPRIMITIVE_LIBRARIES 
 	  llprimitive