Ticket #41241: patch-fix-include-openjpeg.diff

File patch-fix-include-openjpeg.diff, 944 bytes (added by ChristianFrisson (Christian Frisson), 7 years ago)
  • core/vil/CMakeLists.txt

    diff --git a/core/vil/CMakeLists.txt b/core/vil/CMakeLists.txt
    index 34b44a6..6243b94 100644
    ENDIF(ECW_FOUND) 
    6161##############################
    6262INCLUDE( ${VXL_CMAKE_DIR}/FindOpenJPEG2.cmake )
    6363IF(OPENJPEG2_FOUND)
    64   INCLUDE_DIRECTORIES(${OPENJPEG2_INCLUDE_DIR})
     64  INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG2_INCLUDE_DIR})
     65  MESSAGE("OPENJPEG2_INCLUDE_DIR ${OPENJPEG2_INCLUDE_DIR}")
    6566  ADD_DEFINITIONS( ${OPENJPEG2_DEFINITIONS} )
    6667  SET( vil_sources ${vil_sources}
    6768    file_formats/vil_openjpeg.h  file_formats/vil_openjpeg.cxx
    ELSE(VIL_CONFIG_ENABLE_SSE2_ROUNDING) 
    130131  SET(VIL_CONFIG_ENABLE_SSE2_ROUNDING 0)
    131132ENDIF(VIL_CONFIG_ENABLE_SSE2_ROUNDING)
    132133
    133 
    134134# Store the external library configurations in to the config file
    135135CONFIGURE_FILE( ${vxl_SOURCE_DIR}/core/vil/vil_config.h.in
    136136                ${vxl_BINARY_DIR}/core/vil/vil_config.h @ONLY IMMEDIATE )