Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Linux linker errors

Browse Source 
Patch by Aleric
This commit is contained in:
Inusaito Sayori
2014-12-05 12:52:01 -05:00
parent 9e2667261f
commit 18f640d73d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/PNG.cmake
View File

@@ -8,6 +8,7 @@ if (STANDALONE)
include(FindPNG) include(FindPNG)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(libpng) use_prebuilt_binary(libpng)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
if (WINDOWS) if (WINDOWS)
set(PNG_LIBRARIES libpng15) set(PNG_LIBRARIES libpng15)
elseif(DARWIN) elseif(DARWIN)
@@ -30,8 +31,7 @@ else (STANDALONE)
# #
set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive) set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive)
set(PNG_LIBRARIES png16) set(PNG_LIBRARIES png16)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libpng16)
endif () endif ()
endif() endif()
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
endif (STANDALONE) endif (STANDALONE)