1 files changed, 14 insertions, 16 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 799afc77d1..0f0e2d3bbf 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -4,41 +4,39 @@
 include(Prebuilt)
 include(Boost)
 
-if( TARGET colladadom::colladadom )
-    return()
-endif()
+include_guard()
 
 use_prebuilt_binary(colladadom)
 use_prebuilt_binary(minizip-ng) # needed for colladadom
 use_prebuilt_binary(pcre)
 use_prebuilt_binary(libxml2)
 
-create_target( pcre::pcre )
-set_target_libraries( pcre::pcre pcrecpp pcre )
+create_target( ll::pcre )
+set_target_libraries( ll::pcre pcrecpp pcre )
 
-create_target( minizip-ng::minizip-ng )
+create_target( ll::minizip-ng )
 if (WINDOWS)
-    set_target_libraries( minizip-ng::minizip-ng libminizip )
+    set_target_libraries( ll::minizip-ng libminizip )
 else()
-    set_target_libraries( minizip-ng::minizip-ng minizip )
+    set_target_libraries( ll::minizip-ng minizip )
 endif()
 
-create_target( libxml::libxml )
+create_target( ll::libxml )
 if (WINDOWS)
-    set_target_libraries( libxml::libxml libxml2_a)
+    set_target_libraries( ll::libxml libxml2_a)
 else()
-    set_target_libraries( libxml::libxml xml2)
+    set_target_libraries( ll::libxml xml2)
 endif()
 
-create_target( colladadom::colladadom )
-set_target_include_dirs( colladadom::colladadom
+create_target( ll::colladadom )
+set_target_include_dirs( ll::colladadom
         ${LIBS_PREBUILT_DIR}/include/collada
         ${LIBS_PREBUILT_DIR}/include/collada/1.4
         )
 if (WINDOWS)
-    set_target_libraries(colladadom::colladadom libcollada14dom23-s libxml::libxml minizip-ng::minizip-ng )
+    set_target_libraries(ll::colladadom libcollada14dom23-s ll::libxml ll::minizip-ng )
 elseif (DARWIN)
-    set_target_libraries(colladadom::colladadom collada14dom libxml::libxml minizip-ng::minizip-ng)
+    set_target_libraries(ll::colladadom collada14dom ll::libxml ll::minizip-ng)
 elseif (LINUX)
-    set_target_libraries(colladadom::colladadom collada14dom libxml::libxml minizip-ng::minizip-ng)
+    set_target_libraries(ll::colladadom collada14dom ll::libxml ll::minizip-ng)
 endif()
 \ No newline at end of file