ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/itk/openjpeg2.patch

   1 diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
   2 index 565cc338b..c061f0721 100644
   3 --- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
   4 +++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
   5 @@ -194,7 +194,7 @@ mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
   6  # configure name mangling to allow multiple libraries to coexist
   7  # peacefully
   8  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
   9 -set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
  10 +set(MANGLE_PREFIX)
  11  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
  12                 ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
  13                 @ONLY)
  14 diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt
  15 index c4adb91a2..89b731d88 100644
  16 --- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt
  17 +++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt
  18 @@ -3,7 +3,7 @@ include_regular_expression("^.*$")
  19  # configure name mangling to allow multiple libraries to coexist
  20  # peacefully
  21  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
  22 -set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
  23 +set(MANGLE_PREFIX)
  24  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
  25                 ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
  26                 @ONLY)
  27 diff --git a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
  28 index 3811e52f4..a41e9264e 100644
  29 --- a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
  30 +++ b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
  31 @@ -8,10 +8,10 @@ if(ITK_USE_SYSTEM_OpenJPEG)
  32     else()
  33          message(FATAL_ERROR "OpenJPEG target openjp2 missing!")
  34     endif()
  35 -     set(ITKOpenJPEG_INCLUDE_DIRS
  36 -    ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg
  37 -    ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg
  38 -    )
  39 +   #  set(ITKOpenJPEG_INCLUDE_DIRS
  40 +   # ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg
  41 +   # ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg
  42 +   # )
  43  else()
  44    set(ITKOpenJPEG_INCLUDE_DIRS
  45      ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg
  46 diff --git a/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt
  47 index e62e43eda..35dc89976 100644
  48 --- a/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt
  49 +++ b/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt
  50 @@ -68,7 +68,7 @@ CONFIGURE_FILE(${ITK3P_OpenJPEG_SOURCE_DIR}/opj_configure.h.in
  51  # configure name mangling to allow multiple libraries to coexist
  52  # peacefully
  53  if(EXISTS ${ITK3P_OpenJPEG_SOURCE_DIR}/openjpeg_mangle.h.in)
  54 -set(MANGLE_PREFIX itk)
  55 +#set(MANGLE_PREFIX itk)
  56  configure_file(${ITK3P_OpenJPEG_SOURCE_DIR}/openjpeg_mangle.h.in
  57                 ${ITK3P_OpenJPEG_BINARY_DIR}/openjpeg_mangle.h
  58               @ONLY)