Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
5c948aa5
Commit
5c948aa5
authored
Apr 02, 2018
by
Rolf Eike Beer
Browse files
FindDCMTK: use CheckIncludeFiles instead of open coding it
While at it remove a needless status message.
parent
e42fcb11
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/FindDCMTK.cmake
View file @
5c948aa5
...
@@ -309,20 +309,14 @@ find_package_handle_standard_args(DCMTK
...
@@ -309,20 +309,14 @@ find_package_handle_standard_args(DCMTK
# Workaround bug in packaging of DCMTK 3.6.0 on Debian.
# Workaround bug in packaging of DCMTK 3.6.0 on Debian.
# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637687
# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637687
if
(
DCMTK_FOUND AND UNIX AND NOT APPLE
)
if
(
DCMTK_FOUND AND UNIX AND NOT APPLE
)
include
(
CheckCXXSourceCompiles
)
include
(
${
CMAKE_CURRENT_LIST_DIR
}
/CheckIncludeFiles.cmake
)
set
(
CMAKE_REQUIRED_FLAGS
)
set
(
CMAKE_REQUIRED_FLAGS
)
set
(
CMAKE_REQUIRED_DEFINITIONS
)
set
(
CMAKE_REQUIRED_DEFINITIONS
)
set
(
CMAKE_REQUIRED_INCLUDES
${
DCMTK_INCLUDE_DIRS
}
)
set
(
CMAKE_REQUIRED_INCLUDES
${
DCMTK_INCLUDE_DIRS
}
)
set
(
CMAKE_REQUIRED_LIBRARIES
${
DCMTK_LIBRARIES
}
)
set
(
CMAKE_REQUIRED_LIBRARIES
${
DCMTK_LIBRARIES
}
)
set
(
CMAKE_REQUIRED_QUIET
${
DCMTK_FIND_QUIETLY
}
)
set
(
CMAKE_REQUIRED_QUIET
${
DCMTK_FIND_QUIETLY
}
)
check_cxx_source_compiles
(
"#include <dcmtk/config/osconfig.h>
\n
#include <dcmtk/ofstd/ofstream.h>
\n
int main(int,char*[]){return 0;}"
check_include_files
(
"dcmtk/config/osconfig.h;dcmtk/ofstd/ofstream.h"
DCMTK_HAVE_CONFIG_H_OPTIONAL LANGUAGE CXX
)
DCMTK_HAVE_CONFIG_H_OPTIONAL
)
if
(
NOT DCMTK_HAVE_CONFIG_H_OPTIONAL
)
if
(
NOT DCMTK_HAVE_CONFIG_H_OPTIONAL
)
set
(
DCMTK_DEFINITIONS
"HAVE_CONFIG_H"
)
set
(
DCMTK_DEFINITIONS
"HAVE_CONFIG_H"
)
endif
()
endif
()
endif
()
endif
()
if
(
NOT DCMTK_FIND_QUIETLY
)
message
(
STATUS
"Trying to find DCMTK relying on FindDCMTK.cmake - ok"
)
endif
()
Brad King
@brad.king
mentioned in commit
a01caf81
·
Apr 03, 2018
mentioned in commit
a01caf81
mentioned in commit a01caf81a69ba53d04abee97c7aa277d4762ac27
Toggle commit list
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