diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLImage.cmake | 6 | ||||
| -rw-r--r-- | indra/cmake/LLXML.cmake | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/indra/cmake/LLImage.cmake b/indra/cmake/LLImage.cmake index 8874fa54a8..ec3da89081 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 1ce93c0abc..64dfdb604f 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) |