14 files changed, 28 insertions, 43 deletions
diff --git a/indra/cmake/LLCharacter.cmake b/indra/cmake/LLCharacter.cmake
index c74092cdd5..9b2f5c4956 100644
--- a/indra/cmake/LLCharacter.cmake
+++ b/indra/cmake/LLCharacter.cmake
@@ -4,6 +4,4 @@ set(LLCHARACTER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcharacter
     )
 
-set(LLCHARACTER_LIBRARIES
-    llcharacter
-    )
+set(LLCHARACTER_LIBRARIES llcharacter)
diff --git a/indra/cmake/LLCrashLogger.cmake b/indra/cmake/LLCrashLogger.cmake
index 7b362d084c..f2cb83eb8b 100644
--- a/indra/cmake/LLCrashLogger.cmake
+++ b/indra/cmake/LLCrashLogger.cmake
@@ -4,6 +4,4 @@ set(LLCRASHLOGGER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcrashlogger
     )
 
-set(LLCRASHLOGGER_LIBRARIES
-    llcrashlogger
-    )
+set(LLCRASHLOGGER_LIBRARIES llcrashlogger)
diff --git a/indra/cmake/LLDatabase.cmake b/indra/cmake/LLDatabase.cmake
index c3cf62233c..6526101386 100644
--- a/indra/cmake/LLDatabase.cmake
+++ b/indra/cmake/LLDatabase.cmake
@@ -7,7 +7,4 @@ set(LLDATABASE_INCLUDE_DIRS
     ${MYSQL_INCLUDE_DIR}
     )
 
-set(LLDATABASE_LIBRARIES
-    lldatabase
-    ${MYSQL_LIBRARIES}
-    )
+set(LLDATABASE_LIBRARIES lldatabase)
diff --git a/indra/cmake/LLImageJ2COJ.cmake b/indra/cmake/LLImageJ2COJ.cmake
index 91973e0896..1bcf205f2d 100644
--- a/indra/cmake/LLImageJ2COJ.cmake
+++ b/indra/cmake/LLImageJ2COJ.cmake
@@ -2,7 +2,4 @@
 
 include(OpenJPEG)
 
-set(LLIMAGEJ2COJ_LIBRARIES
-    llimagej2coj
-    ${OPENJPEG_LIBRARIES}
-    )
+set(LLIMAGEJ2COJ_LIBRARIES llimagej2coj)
diff --git a/indra/cmake/LLInventory.cmake b/indra/cmake/LLInventory.cmake
index 7d5f492388..c3dc077a2b 100644
--- a/indra/cmake/LLInventory.cmake
+++ b/indra/cmake/LLInventory.cmake
@@ -4,6 +4,4 @@ set(LLINVENTORY_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llinventory
     )
 
-set(LLINVENTORY_LIBRARIES
-    llinventory
-    )
+set(LLINVENTORY_LIBRARIES llinventory)
diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake
index 8afd45efc6..893920ae6f 100644
--- a/indra/cmake/LLMath.cmake
+++ b/indra/cmake/LLMath.cmake
@@ -4,6 +4,4 @@ set(LLMATH_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmath
     )
 
-set(LLMATH_LIBRARIES
-    llmath
-    )
+set(LLMATH_LIBRARIES llmath)
diff --git a/indra/cmake/LLMessage.cmake b/indra/cmake/LLMessage.cmake
index 1cea03af2b..0143d04fd7 100644
--- a/indra/cmake/LLMessage.cmake
+++ b/indra/cmake/LLMessage.cmake
@@ -12,11 +12,4 @@ set(LLMESSAGE_INCLUDE_DIRS
     ${OPENSSL_INCLUDE_DIRS}
     )
 
-set(LLMESSAGE_LIBRARIES
-    llmessage
-    ${CURL_LIBRARIES}
-    ${CARES_LIBRARIES}
-    ${OPENSSL_LIBRARIES}
-    ${CRYPTO_LIBRARIES}
-    ${XMLRPCEPI_LIBRARIES}
-    )
+set(LLMESSAGE_LIBRARIES llmessage)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 0426ae539a..d397b78f1c 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -4,6 +4,4 @@ set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
     )
 
-set(LLPRIMITIVE_LIBRARIES
-    llprimitive
-    )
+set(LLPRIMITIVE_LIBRARIES llprimitive)
diff --git a/indra/cmake/LLScene.cmake b/indra/cmake/LLScene.cmake
index d1c32b3199..96ad5085a2 100644
--- a/indra/cmake/LLScene.cmake
+++ b/indra/cmake/LLScene.cmake
@@ -4,6 +4,4 @@ set(LLSCENE_INCLUDE_DIRS
     ${LIBS_SERVER_DIR}/llscene
     )
 
-set(LLSCENE_LIBRARIES
-    llscene
-    )
+set(LLSCENE_LIBRARIES llscene)
diff --git a/indra/cmake/LLUI.cmake b/indra/cmake/LLUI.cmake
index d1287de018..34de57108b 100644
--- a/indra/cmake/LLUI.cmake
+++ b/indra/cmake/LLUI.cmake
@@ -4,6 +4,4 @@ set(LLUI_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llui
     )
 
-set(LLUI_LIBRARIES
-    llui
-    )
+set(LLUI_LIBRARIES llui)
diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake
index 5ce3d2578e..0fe87cdea6 100644
--- a/indra/cmake/LLVFS.cmake
+++ b/indra/cmake/LLVFS.cmake
@@ -5,9 +5,3 @@ set(LLVFS_INCLUDE_DIRS
     )
 
 set(LLVFS_LIBRARIES llvfs)
-
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(CARBON_LIBRARY Carbon)
-  list(APPEND LLVFS_LIBRARIES ${CARBON_LIBRARY})
-endif (DARWIN)
diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index ed3ff3c8ee..97d22cf86a 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -29,3 +29,7 @@ set_source_files_properties(${llimagej2coj_HEADER_FILES}
 list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
 
 add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
+target_link_libraries(
+    llimagej2coj
+    ${OPENJPEG_LIBRARIES}
+    )
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index ba17265a66..fd22de9399 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -189,3 +189,11 @@ set_source_files_properties(${llmessage_HEADER_FILES}
 list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
 
 add_library (llmessage ${llmessage_SOURCE_FILES})
+target_link_libraries(
+    llmessage
+    ${CURL_LIBRARIES}
+    ${CARES_LIBRARIES}
+    ${OPENSSL_LIBRARIES}
+    ${CRYPTO_LIBRARIES}
+    ${XMLRPCEPI_LIBRARIES}
+    )
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
index 9f136f7772..c3c12efdd0 100644
--- a/indra/llvfs/CMakeLists.txt
+++ b/indra/llvfs/CMakeLists.txt
@@ -56,3 +56,9 @@ set_source_files_properties(${llvfs_HEADER_FILES}
 list(APPEND llvfs_SOURCE_FILES ${llvfs_HEADER_FILES})
 
 add_library (llvfs ${llvfs_SOURCE_FILES})
+
+if (DARWIN)
+  include(CMakeFindFrameworks)
+  find_library(CARBON_LIBRARY Carbon)
+  target_link_libraries(llvfs ${CARBON_LIBRARY})
+endif (DARWIN)