ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/minc/build.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 52cc81ace..d7a1f63f8 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -403,9 +404,11 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
   6  # Keep this variable for compatibility
   7  SET(VOLUME_IO_LIBRARY  ${LIBMINC_EXTERNAL_LIB_PREFIX}minc2)
   8  SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
   9
  10  ADD_LIBRARY(${LIBMINC_LIBRARY} ${LIBRARY_TYPE} ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
  11 -
  12 +if(WIN32)
  13 +    target_link_libraries(${LIBMINC_LIBRARY} ws2_32)
  14 +endif()
  15  IF(NIFTI_FOUND AND NOT LIBMINC_USE_SYSTEM_NIFTI)
  16      ADD_DEPENDENCIES(${LIBMINC_LIBRARY} NIFTI)
  17  ENDIF()
  18 @@ -453,7 +456,7 @@ IF( LIBMINC_INSTALL_LIB_DIR )
  19        ${LIBMINC_EXPORTED_TARGETS}
  20      LIBRARY DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries
  21      ARCHIVE DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries
  22 -    RUNTIME DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries
  23 +    RUNTIME DESTINATION ${LIBMINC_INSTALL_BIN_DIR} COMPONENT libraries
  24    )
  25  ENDIF( LIBMINC_INSTALL_LIB_DIR )
  26
  27 @@ -538,7 +541,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
  28       ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake
  29       ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake
  30      DESTINATION
  31 -     ${LIBMINC_INSTALL_LIB_DIR}
  32 +     ${LIBMINC_INSTALL_LIB_DIR}/cmake
  33      COMPONENT Development)
  34
  35  ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
  36 diff --git a/config.h.cmake b/config.h.cmake
  37 index 9ceffa8fc..21c2f3baf 100644
  38 --- a/config.h.cmake
  39 +++ b/config.h.cmake
  40 @@ -1,4 +1,8 @@
  41  /* various defines */
  42 +#ifdef _MSC_VER
  43 +#define strcasecmp _stricmp
  44 +#define strncasecmp _strnicmp
  45 +#endif
  46
  47  #ifndef MINC2
  48  #define MINC2 @MINC2@
  49 diff --git a/libcommon/minc_config.c b/libcommon/minc_config.c
  50 index 531ef108e..5472d9274 100644
  51 --- a/libcommon/minc_config.c
  52 +++ b/libcommon/minc_config.c
  53 @@ -20,14 +20,6 @@
  54
  55  #include "minc_config.h"
  56
  57 -#ifdef _MSC_VER
  58 -#define snprintf _snprintf
  59 -#define vsnprintf _vsnprintf
  60 -#define strcasecmp _stricmp
  61 -#define strncasecmp _strnicmp
  62 -#endif
  63 -
  64 -
  65  static const char *_CONFIG_VAR[]=
  66    {
  67        "MINC_FORCE_V2",