summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-13 11:59:57 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-13 11:59:57 -0700
commitc4a99e9a6ea3ee737acc6a65a65038975bda70d3 (patch)
treea97fd0b9ecd79896f239091b9a88d26009a70a21
parent9c4a2547b928beb167df133994dfe453f95cddb3 (diff)
VWR-22769 : libPNG linking: fixed the non standalone case so that we can keep things unchanged for those folks (libpng wise) while taking in changes making things easier for standalone builders
-rw-r--r--indra/cmake/PNG.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index f1ab7fcdd5..5a011de0c3 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -6,6 +6,6 @@ set(PNG_FIND_REQUIRED ON)
if (STANDALONE)
include(FindPNG)
else (STANDALONE)
- set(PNG_LIBRARIES png)
- set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+ set(PNG_LIBRARIES png12)
+ set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
endif (STANDALONE)