From 3827b395fbca941846dab494ee8449786a39561d Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Thu, 24 Jun 2010 16:45:47 -0700 Subject: Fixed cmake to grab the decomposition libraries. --- indra/cmake/CMakeLists.txt | 2 +- indra/newview/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 8612c46376..cadd2608e2 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -42,7 +42,7 @@ set(cmake_SOURCE_FILES LLAudio.cmake LLCharacter.cmake LLCommon.cmake - LLConvexDecompInter.cmake + LLConvexDecomposition.cmake LLCrashLogger.cmake LLDatabase.cmake LLImage.cmake diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f0b58b385c..45291e60f9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -16,7 +16,7 @@ include(FindOpenGL) include(LLAudio) include(LLCharacter) include(LLCommon) -include(LLConvexDecompInter) +include(LLConvexDecomposition) include(LLImage) include(LLImageJ2COJ) include(LLInventory) @@ -50,7 +50,7 @@ include_directories( ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} - ${LLCONVEXDECOMPINTER_INCLUDE_DIRS} + ${LLCONVEXDECOMP_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} ${LLINVENTORY_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} @@ -1682,7 +1682,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES} - ${LLCONVEXDECOMPINTER_LIBRARIES} + ${LLCONVEXDECOMP_LIBRARY} ) build_version(viewer) -- cgit v1.2.3