From 1496c3d0eee43223ad9714b06ee94e334c730731 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Fri, 29 Aug 2008 21:46:30 +0000
Subject: [PATCH] Switch llimage and llxml to target_link_libraries
---
indra/cmake/LLImage.cmake | 6 +-----
indra/cmake/LLXML.cmake | 7 +++----
indra/linux_crash_logger/CMakeLists.txt | 2 --
indra/llimage/CMakeLists.txt | 5 +++++
indra/llxml/CMakeLists.txt | 5 +++++
indra/mac_crash_logger/CMakeLists.txt | 2 --
indra/newview/CMakeLists.txt | 1 -
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/indra/cmake/LLImage.cmake b/indra/cmake/LLImage.cmake
index 8874fa54a8a..ec3da890811 100644
--- a/indra/cmake/LLImage.cmake
+++ b/indra/cmake/LLImage.cmake
@@ -8,8 +8,4 @@ set(LLIMAGE_INCLUDE_DIRS
${JPEG_INCLUDE_DIRS}
)
-set(LLIMAGE_LIBRARIES
- llimage
- ${JPEG_LIBRARIES}
- ${PNG_LIBRARIES}
- )
+set(LLIMAGE_LIBRARIES llimage)
diff --git a/indra/cmake/LLXML.cmake b/indra/cmake/LLXML.cmake
index 1ce93c0abc5..64dfdb604f1 100644
--- a/indra/cmake/LLXML.cmake
+++ b/indra/cmake/LLXML.cmake
@@ -1,13 +1,12 @@
# -*- cmake -*-
+include(Boost)
include(EXPAT)
set(LLXML_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llxml
+ ${Boost_INCLUDE_DIRS}
${EXPAT_INCLUDE_DIRS}
)
-set(LLXML_LIBRARIES
- llxml
- ${EXPAT_LIBRARIES}
- )
+set(LLXML_LIBRARIES llxml)
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 628d4acefc7..d03487b01b1 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -3,7 +3,6 @@
project(linux_crash_logger)
include(00-Common)
-include(Boost)
include(LLCommon)
include(LLCrashLogger)
include(LLMath)
@@ -52,7 +51,6 @@ target_link_libraries(linux-crash-logger
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
${UI_LIBRARIES}
- ${BOOST_SIGNALS_LIBRARY}
${DB_LIBRARIES}
)
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 5593b4a0cb3..3864d585dc2 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -48,3 +48,8 @@ set_source_files_properties(${llimage_HEADER_FILES}
list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
add_library (llimage ${llimage_SOURCE_FILES})
+target_link_libraries(
+ llimage
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
+ )
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index d86bc0d564d..9febd9775d1 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -34,3 +34,8 @@ set_source_files_properties(${llxml_HEADER_FILES}
list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES})
add_library (llxml ${llxml_SOURCE_FILES})
+target_link_libraries(
+ llxml
+ ${BOOST_SIGNALS_LIBRARY}
+ ${EXPAT_LIBRARIES}
+ )
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index 9cddb562f73..39125956895 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -3,7 +3,6 @@
project(mac_crash_logger)
include(00-Common)
-include(Boost)
include(LLCommon)
include(LLCrashLogger)
include(LLMath)
@@ -64,7 +63,6 @@ target_link_libraries(mac-crash-logger
${LLVFS_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
- ${BOOST_SIGNALS_LIBRARY}
)
add_custom_command(
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9a01a84de8f..c22911f3161 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1376,7 +1376,6 @@ target_link_libraries(secondlife-bin
${viewer_LIBRARIES}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
- ${BOOST_SIGNALS_LIBRARY}
${OPENGL_LIBRARIES}
${FMODWRAPPER_LIBRARY}
${OPENGL_LIBRARIES}
--
GitLab