Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
CamiTK Community Edition
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CamiTK
CamiTK Community Edition
Commits
ee47453f
Commit
ee47453f
authored
Jan 13, 2020
by
Jean-Loup Haberbusch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/GDCM-File-not-found' into 'develop'
Bug/gdcm file not found See merge request
!135
parents
8c0413db
7c83b24e
Changes
1
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
24 deletions
+19
-24
sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
+19
-24
No files found.
sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
View file @
ee47453f
...
...
@@ -360,37 +360,32 @@ macro(camitk_extension)
if
(
GDCM_FOUND
)
include
(
${
GDCM_USE_FILE
}
)
if
(
MSVC
)
set
(
GDCM_LIBRARIES
debug
${
GDCM_DIR
}
/../gdcmcharls
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmCommon
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmDICT
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmDSED
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmexpat
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmgetopt
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmIOD
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmjpeg8
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmjpeg12
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmjpeg16
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmMEXD
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmMSFF
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmopenjpeg
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmzlib
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../socketxx
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../vtkgdcm
${
CAMITK_DEBUG_POSTFIX
}
.lib
debug
${
GDCM_DIR
}
/../gdcmDSED
${
CAMITK_DEBUG_POSTFIX
}
.lib
optimized gdcmcharls gdcmCommon gdcmDICT gdcmDSED gdcmexpat
optimized gdcmgetopt gdcmIOD gdcmjpeg8 gdcmjpeg12 gdcmjpeg16
optimized gdcmMEXD gdcmMSFF gdcmopenjpeg gdcmzlib socketxx vtkgdcm
optimized gdcmDSED
)
# List all available GDCM library files
file
(
GLOB GDCM_LIB_FILES
LIST_DIRECTORIES false
"
${
GDCM_DIR
}
/../*
${
CAMITK_DEBUG_POSTFIX
}
.lib"
)
unset
(
GDCM_LIBRARIES
)
foreach
(
GDCM_LIB_FILE
${
GDCM_LIB_FILES
}
)
# Get the actual name of the library
string
(
REGEX REPLACE
"^.*/(.*)
${
CAMITK_DEBUG_POSTFIX
}
.lib"
"
\\
1"
GDCM_LIB_FILE_OPTIMIZED
"
${
GDCM_LIB_FILE
}
"
)
# Add both debug and optimized version
set
(
GDCM_LIBRARIES
${
GDCM_LIBRARIES
}
debug
${
GDCM_LIB_FILE
}
optimized
${
GDCM_LIB_FILE_OPTIMIZED
}
)
endforeach
()
else
()
set
(
GDCM_LIBRARIES gdcmCommon gdcmDICT gdcmDSED gdcmMEXD gdcmMSFF vtkgdcm
)
endif
()
else
()
message
(
ERROR
"
${
EXTENSION_NAME
}
: GDCM 2.x library required. Please install GDCM."
)
message
(
ERROR
"
${
EXTENSION_NAME
}
: GDCM 2.x
or above
library required. Please install GDCM."
)
endif
()
endif
()
# EXTERNAL LIBRARIES
set
(
EXTERNAL_LIBRARIES
)
if
(
${
EXTENSION_NAME_CMAKE
}
_EXTERNAL_LIBRARIES
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment