diff options
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 10 | ||||
| -rw-r--r-- | indra/llkdu/CMakeLists.txt | 45 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
3 files changed, 27 insertions, 29 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index 5b28f9b2e6..e80b235376 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -10,13 +10,11 @@ endif (INSTALL_PROPRIETARY AND NOT STANDALONE) if (USE_KDU) use_prebuilt_binary(kdu) if (WINDOWS) - set(KDU_LIBRARY debug kdud optimized kdu) + set(KDU_LIBRARY debug kdud.lib optimized kdu.lib) else (WINDOWS) - set(KDU_LIBRARY kdu) + set(KDU_LIBRARY libkdu.a) endif (WINDOWS) - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu) - - set(LLKDU_LIBRARY llkdu) - set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) + set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) + set(LLKDU_LIBRARIES llkdu) endif (USE_KDU) diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt index 0932d368b5..fe590c98f8 100644 --- a/indra/llkdu/CMakeLists.txt +++ b/indra/llkdu/CMakeLists.txt @@ -7,15 +7,13 @@ project(llkdu) # errors), even when the specific warnings that make it croak are # disabled. -set(VS_DISABLE_FATAL_WARNINGS ON) +#set(VS_DISABLE_FATAL_WARNINGS ON) include(00-Common) include(LLCommon) include(LLImage) include(LLKDU) include(LLMath) -#include(LLVFS) -#include(Linking) include_directories( ${LLCOMMON_INCLUDE_DIRS} @@ -31,6 +29,7 @@ set(llkdu_SOURCE_FILES set(llkdu_HEADER_FILES CMakeLists.txt + llimagej2ckdu.h llkdumem.h ) @@ -40,28 +39,28 @@ set_source_files_properties(${llkdu_HEADER_FILES} list(APPEND llkdu_SOURCE_FILES ${llkdu_HEADER_FILES}) -if (WINDOWS) +#if (WINDOWS) # This turns off the warning about flow control ending in a destructor. - set_source_files_properties( - kdu_image.cpp llkdumem.cpp - PROPERTIES - COMPILE_FLAGS "/wd4702 /wd4722" - ) +# set_source_files_properties( +# kdu_image.cpp llkdumem.cpp +# PROPERTIES +# COMPILE_FLAGS "/wd4702 /wd4722" +# ) # This turns off the warning about sprintf in the following 2 files. - set_source_files_properties( - kde_flow_control.cpp kdc_flow_control.cpp - PROPERTIES - COMPILE_FLAGS /D_CRT_SECURE_NO_DEPRECATE - ) -endif (WINDOWS) +# set_source_files_properties( +# kde_flow_control.cpp kdc_flow_control.cpp +# PROPERTIES +# COMPILE_FLAGS /D_CRT_SECURE_NO_DEPRECATE +# ) +#endif (WINDOWS) -if (LLKDU_LIBRARY) - add_library (${LLKDU_LIBRARY} ${llkdu_SOURCE_FILES}) +if (USE_KDU) + add_library (${LLKDU_LIBRARIES} ${llkdu_SOURCE_FILES}) - target_link_libraries( - ${LLKDU_LIBRARY} - ${LLMATH_LIBRARIES} - ${KDU_LIBRARY} - ) -endif (LLKDU_LIBRARY) +# target_link_libraries( +# ${LLKDU_LIBRARY} +# ${LLMATH_LIBRARIES} +# ${KDU_LIBRARY} +# ) +endif (USE_KDU) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 8d6c9d7f7b..a197ac1b81 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -50,6 +50,7 @@ include_directories( ${LLCHARACTER_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} + ${LLKDU_INCLUDE_DIRS} ${LLINVENTORY_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} |