livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the build for PE. 

Now building with llkdu can be skipped by specifying INSTALL_PROPRIETARY=OFF when configuring the build.
Reviewed by palmer
master
Mark Palange (Mani) 2009-10-22 15:38:26 -07:00
parent f58857824e
commit f67e44c503
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/LLKDU.cmake
View File

@ -1,7 +1,7 @@
# -*- cmake -*-
include(Prebuilt)
if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
if (INSTALL_PROPRIETARY AND NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
use_prebuilt_binary(kdu)
if (WINDOWS)
set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
@ -15,4 +15,4 @@ if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
set(LLKDU_STATIC_LIBRARY llkdu_static)
set(LLKDU_LIBRARIES ${LLKDU_LIBRARY})
set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY})
endif (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
endif (INSTALL_PROPRIETARY AND NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)

6
indra/newview/CMakeLists.txt
View File

@ -1388,7 +1388,11 @@ if (WINDOWS)
COMMENT "Copying staged dlls."
)
add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon llkdu)
add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon)
if(LLKDU_LIBRARY)
# kdu may not exist!
add_dependencies(${VIEWER_BINARY_NAME} llkdu)
endif(LLKDU_LIBRARY)
endif(WINDOWS)
if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)