livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch llimage and llxml to target_link_libraries

master
Bryan O'Sullivan 2008-08-29 21:46:30 +00:00
parent eb65aca9f8
commit 1496c3d0ee
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/LLImage.cmake
View File

@ -8,8 +8,4 @@ set(LLIMAGE_INCLUDE_DIRS
${JPEG_INCLUDE_DIRS}
)
set(LLIMAGE_LIBRARIES
llimage
${JPEG_LIBRARIES}
${PNG_LIBRARIES}
)
set(LLIMAGE_LIBRARIES llimage)

7
indra/cmake/LLXML.cmake
View File

@ -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)

2
indra/linux_crash_logger/CMakeLists.txt
View File

@ -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}
)

5
indra/llimage/CMakeLists.txt
View File

@ -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}
)

5
indra/llxml/CMakeLists.txt
View File

@ -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}
)

2
indra/mac_crash_logger/CMakeLists.txt
View File

@ -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(

1
indra/newview/CMakeLists.txt
View File

@ -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}