From 3bf611c72a5527f4d30de17db22bd6b8814909de Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 14 Feb 2019 19:47:51 +0100 Subject: [PATCH] Logic to find KDU qhwn building standalone. --- indra/cmake/LLKDU.cmake | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index e478b01f84..84244f0380 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -8,14 +8,24 @@ if (INSTALL_PROPRIETARY) endif (INSTALL_PROPRIETARY) if (USE_KDU) - include(Prebuilt) - use_prebuilt_binary(kdu) - if (WINDOWS) - set(KDU_LIBRARY kdu.lib) - else (WINDOWS) - set(KDU_LIBRARY libkdu.a) - endif (WINDOWS) - set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu) - set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) - set(LLKDU_LIBRARIES llkdu) + if (USESYSTEMLIBS) + find_path( KDU_INCLUDE_DIR kdu/kdu_image.h ) + find_library( KDU_LIBRARY kdu_x64 ) + if ( NOT KDU_LIBRARY OR NOT KDU_INCLUDE_DIR ) + message(FATAL_ERROR "Cannot find KDU: Library '${KDU_LIBRARY}'; header '${KDU_INCLUDE_DIR}' ") + endif() + set( KDU_INCLUDE_DIR ${KDU_INCLUDE_DIR}/kdu ) + set( LLKDU_LIBRARIES llkdu ) + else() + include(Prebuilt) + use_prebuilt_binary(kdu) + if (WINDOWS) + set(KDU_LIBRARY kdu.lib) + else (WINDOWS) + set(KDU_LIBRARY libkdu.a) + endif (WINDOWS) + set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu) + set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu) + set(LLKDU_LIBRARIES llkdu) + endif() endif (USE_KDU)