mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 21:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[gdcm] Fix file UseGDCM.cmake path name (#7852)

Browse Source
This commit is contained in:
Lily 2019-09-16 21:18:12 +08:00 committed by Griffin Downs
parent ca12944bb3
commit f0f2d2e43b
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/gdcm/CONTROL
View File

@ -1,4 +1,4 @@
Source: gdcm
Version: 3.0.0-4
Version: 3.0.0-5
Description: Grassroots DICOM library
Build-Depends: zlib, expat, openjpeg

41
ports/gdcm/Fix-Cmake_DIR.patch Normal file
View 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)

1
ports/gdcm/portfile.cmake
View File

@ -11,6 +11,7 @@ vcpkg_from_github(
PATCHES
use-openjpeg-config.patch
fix-share-path.patch
Fix-Cmake_DIR.patch
)
file(REMOVE ${SOURCE_PATH}/CMake/FindOpenJPEG.cmake)