early-access version 2853
This commit is contained in:
41
externals/vcpkg/ports/gdcm/Fix-Cmake_DIR.patch
vendored
Executable file
41
externals/vcpkg/ports/gdcm/Fix-Cmake_DIR.patch
vendored
Executable file
@@ -0,0 +1,41 @@
|
||||
diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in
|
||||
index f8e9d0b..ab28546 100644
|
||||
--- a/CMake/ExportConfiguration/GDCMConfig.cmake.in
|
||||
+++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in
|
||||
@@ -33,28 +33,28 @@ if(GDCM_USE_VTK)
|
||||
set(GDCM_VTK_DIR "@GDCM_VTK_DIR_CONFIG@")
|
||||
endif()
|
||||
|
||||
-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
-if(EXISTS ${SELF_DIR}/GDCMTargets.cmake)
|
||||
+get_filename_component(GDCM_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
+if(EXISTS ${GDCM_SELF_DIR}/GDCMTargets.cmake)
|
||||
# This is an install tree
|
||||
- include(${SELF_DIR}/GDCMTargets.cmake)
|
||||
- get_filename_component(GDCM_INCLUDE_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||
+ include(${GDCM_SELF_DIR}/GDCMTargets.cmake)
|
||||
+ get_filename_component(GDCM_INCLUDE_ROOT "${GDCM_SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE)
|
||||
set(GDCM_INCLUDE_DIRS ${GDCM_INCLUDE_ROOT})
|
||||
- get_filename_component(GDCM_LIB_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE)
|
||||
+ get_filename_component(GDCM_LIB_ROOT "${GDCM_SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE)
|
||||
set(GDCM_LIBRARY_DIRS ${GDCM_LIB_ROOT})
|
||||
else()
|
||||
- if(EXISTS ${SELF_DIR}/GDCMExports.cmake)
|
||||
+ if(EXISTS ${GDCM_SELF_DIR}/GDCMExports.cmake)
|
||||
# This is a build tree
|
||||
set( GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_PATH@")
|
||||
set(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIR@")
|
||||
|
||||
- include(${SELF_DIR}/GDCMExports.cmake)
|
||||
+ include(${GDCM_SELF_DIR}/GDCMExports.cmake)
|
||||
|
||||
else()
|
||||
message(FATAL_ERROR "ooops")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-set(GDCM_USE_FILE ${SELF_DIR}/UseGDCM.cmake)
|
||||
+set(GDCM_USE_FILE ${GDCM_SELF_DIR}/UseGDCM.cmake)
|
||||
|
||||
# Backward compatible part:
|
||||
set(GDCM_FOUND TRUE)
|
||||
32
externals/vcpkg/ports/gdcm/fix-share-path.patch
vendored
Executable file
32
externals/vcpkg/ports/gdcm/fix-share-path.patch
vendored
Executable file
@@ -0,0 +1,32 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6ac16ab..842d833 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -246,15 +246,15 @@ if(NOT GDCM_INSTALL_LIB_DIR)
|
||||
endif()
|
||||
|
||||
if(NOT GDCM_INSTALL_DATA_DIR)
|
||||
- set(GDCM_INSTALL_DATA_DIR "share/${subdir}")
|
||||
+ set(GDCM_INSTALL_DATA_DIR "share/${projectname}")
|
||||
endif()
|
||||
|
||||
if(NOT GDCM_INSTALL_INCLUDE_DIR)
|
||||
- set(GDCM_INSTALL_INCLUDE_DIR "include/${subdir}")
|
||||
+ set(GDCM_INSTALL_INCLUDE_DIR "include/${projectname}")
|
||||
endif()
|
||||
|
||||
if(NOT GDCM_INSTALL_DOC_DIR)
|
||||
- set(GDCM_INSTALL_DOC_DIR "share/doc/${subdir}")
|
||||
+ set(GDCM_INSTALL_DOC_DIR "share/doc/${projectname}")
|
||||
endif()
|
||||
|
||||
if(NOT GDCM_INSTALL_MAN_DIR)
|
||||
@@ -262,7 +262,7 @@ if(NOT GDCM_INSTALL_MAN_DIR)
|
||||
endif()
|
||||
|
||||
if(NOT GDCM_INSTALL_PACKAGE_DIR)
|
||||
- set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${subdir}
|
||||
+ set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${projectname}
|
||||
CACHE INTERNAL "")
|
||||
endif()
|
||||
|
||||
62
externals/vcpkg/ports/gdcm/portfile.cmake
vendored
Executable file
62
externals/vcpkg/ports/gdcm/portfile.cmake
vendored
Executable file
@@ -0,0 +1,62 @@
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO malaterre/GDCM
|
||||
REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12
|
||||
SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
use-openjpeg-config.patch
|
||||
fix-share-path.patch
|
||||
Fix-Cmake_DIR.patch
|
||||
)
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/CMake/FindOpenJPEG.cmake")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
set(VCPKG_BUILD_SHARED_LIBS ON)
|
||||
else()
|
||||
set(VCPKG_BUILD_SHARED_LIBS OFF)
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
|
||||
-DGDCM_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
|
||||
-DGDCM_INSTALL_INCLUDE_DIR=include
|
||||
-DGDCM_USE_SYSTEM_EXPAT=ON
|
||||
-DGDCM_USE_SYSTEM_ZLIB=ON
|
||||
-DGDCM_USE_SYSTEM_OPENJPEG=ON
|
||||
-DGDCM_BUILD_TESTING=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/gdcm)
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
)
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake"
|
||||
"set(CMAKE_IMPORT_FILE_VERSION 1)"
|
||||
"set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||
find_package(OpenJPEG QUIET)"
|
||||
)
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_SOURCE_DIR \"${SOURCE_PATH}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_EXECUTABLE_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_LIBRARY_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_CMAKE_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "")
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMConfig.cmake" "set( GDCM_INCLUDE_DIRS \"${SOURCE_PATH}/Source/Common;${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Source/Common;${SOURCE_PATH}/Source/DataStructureAndEncodingDefinition;${SOURCE_PATH}/Source/MediaStorageAndFileFormat;${SOURCE_PATH}/Source/MessageExchangeDefinition;${SOURCE_PATH}/Source/DataDictionary;${SOURCE_PATH}/Source/InformationObjectDefinition\")" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMConfig.cmake" "set(GDCM_LIBRARY_DIRS \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/.\")" "")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
16
externals/vcpkg/ports/gdcm/use-openjpeg-config.patch
vendored
Executable file
16
externals/vcpkg/ports/gdcm/use-openjpeg-config.patch
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f82bfd2..a062170 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -375,7 +375,10 @@ else()
|
||||
endif()
|
||||
|
||||
if(GDCM_USE_SYSTEM_OPENJPEG)
|
||||
- find_package(OpenJPEG 2.0.0 REQUIRED)
|
||||
+ find_package(OpenJPEG REQUIRED)
|
||||
+ if(OPENJPEG_MAJOR_VERSION VERSION_LESS 2)
|
||||
+ message( FATAL_ERROR "You need at least OpenJPEG 2")
|
||||
+ endif()
|
||||
set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
|
||||
else()
|
||||
set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
|
||||
21
externals/vcpkg/ports/gdcm/vcpkg.json
vendored
Executable file
21
externals/vcpkg/ports/gdcm/vcpkg.json
vendored
Executable file
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"name": "gdcm",
|
||||
"version": "3.0.12",
|
||||
"description": "Grassroots DICOM library",
|
||||
"homepage": "https://github.com/malaterre/GDCM",
|
||||
"license": "BSD-3-Clause",
|
||||
"supports": "!uwp & !(windows & arm)",
|
||||
"dependencies": [
|
||||
"expat",
|
||||
"openjpeg",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user