diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-08-29 21:46:30 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-08-29 21:46:30 +0000 |
| commit | 1496c3d0eee43223ad9714b06ee94e334c730731 (patch) | |
| tree | 7d2be99bdd17f2f1370c4425a6268922d8866e8b /indra/cmake | |
| parent | eb65aca9f8aaa1ce67a221dcfecce240f1bb59a5 (diff) | |
Switch llimage and llxml to target_link_libraries
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) |