1 files changed, 14 insertions, 33 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 7b6d04b096..d69cd958a0 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -4,27 +4,10 @@ project(llprimitive)
 
 include(00-Common)
 include(LLCommon)
-include(LLMath)
-include(LLMessage)
 include(LLCoreHttp)
-include(LLXML)
 include(LLPhysicsExtensions)
-include(LLCharacter)
-
-include_directories(
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLMATH_INCLUDE_DIRS}
-    ${LLMESSAGE_INCLUDE_DIRS}
-    ${LLXML_INCLUDE_DIRS}
-    ${LIBS_PREBUILT_DIR}/include/collada
-    ${LIBS_PREBUILT_DIR}/include/collada/1.4
-    ${LLCHARACTER_INCLUDE_DIRS}
-    )
-include_directories(SYSTEM
-    ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
-    ${LLXML_SYSTEM_INCLUDE_DIRS}
-    ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
-    )
+include(LLPrimitive)
+include(GLH)
 
 set(llprimitive_SOURCE_FILES
     lldaeloader.cpp
@@ -64,26 +47,24 @@ set(llprimitive_HEADER_FILES
     material_codes.h
     object_flags.h
     )
-        
-set_source_files_properties(${llprimitive_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
 
 list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES})
 
 add_library (llprimitive ${llprimitive_SOURCE_FILES})
+target_include_directories( llprimitive  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(llprimitive
-    ${LLCOMMON_LIBRARIES}
-    ${LLMATH_LIBRARIES}
-    ${LLMESSAGE_LIBRARIES}
-    ${LLCOREHTTP_LIBRARIES}
-    ${LLXML_LIBRARIES}
-    ${LLPHYSICSEXTENSIONS_LIBRARIES}
-    ${LLCHARACTER_LIBRARIES}
-    ${BOOST_FIBER_LIBRARY}
-    ${BOOST_CONTEXT_LIBRARY}
-    )
-
+        llcommon
+        llmath
+        llmessage
+        llcorehttp
+        llxml
+        llcharacter
+        llphysicsextensions_impl
+        ll::colladadom
+        ll::pcre
+        ll::glh_linear
+        )
 
 #add unit tests
 if (LL_TESTS)