Fixed configure warnings reported by CMake 3.19.

AAArdu · Mar 23, 2021 · b08b27b · b08b27b
1 parent d43a533
commit b08b27b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
@@ -120,7 +120,7 @@ if(DCMTK_USE_FIND_PACKAGE)
 
   # Find libsndfile
   if(DCMTK_WITH_SNDFILE)
-    find_package(Sndfile QUIET)
+    find_package(SNDFILE QUIET)
     if(NOT SNDFILE_LIBS)
       message(STATUS "Warning: SNDFILE support will be disabled because libsndfile was not found.")
       set(WITH_SNDFILE "")
@@ -136,7 +136,7 @@ if(DCMTK_USE_FIND_PACKAGE)
   # Find libiconv
   if(DCMTK_WITH_ICONV)
     find_package(Iconv QUIET)
-    find_package(Charset QUIET)
+    find_package(LIBCHARSET QUIET)
     if(ICONV_FOUND)
         if(NOT Iconv_IS_BUILT_IN)
             set(LIBICONV_FOUND ${ICONV_FOUND})
@@ -165,7 +165,7 @@ if(DCMTK_USE_FIND_PACKAGE)
 
   # Find libwrap
   if(DCMTK_WITH_WRAP)
-    find_package(Wrap QUIET)
+    find_package(WRAP QUIET)
     if(NOT WRAP_FOUND)
       message(STATUS "Warning: WRAP support will be disabled because libwrap was not found.")
       set(WITH_TCPWRAPPER "")

diff --git a/CMake/FindCharset.cmake → CMake/FindLIBCHARSET.cmake b/CMake/FindCharset.cmake → CMake/FindLIBCHARSET.cmake
diff --git a/CMake/FindSndfile.cmake → CMake/FindSNDFILE.cmake b/CMake/FindSndfile.cmake → CMake/FindSNDFILE.cmake
diff --git a/CMake/FindWrap.cmake → CMake/FindWRAP.cmake b/CMake/FindWrap.cmake → CMake/FindWRAP.cmake
diff --git a/CMake/GenerateCMakeExports.cmake b/CMake/GenerateCMakeExports.cmake
@@ -16,7 +16,9 @@
 
 # Get and store all executable targets to DCMTKTargets.cmake within build's main dir
 get_property(DCMTK_EXECUTABLE_TARGETS GLOBAL PROPERTY DCMTK_EXECUTABLE_TARGETS)
-export(TARGETS ${DCMTK_EXECUTABLE_TARGETS} FILE "${DCMTK_BUILD_CMKDIR}/DCMTKTargets.cmake")
+# DCMTKTargets.cmake is created as an empty file in dcmtkPrepare.cmake.
+# We need to specify APPEND here, otherwise newer versions of CMake will complain.
+export(TARGETS ${DCMTK_EXECUTABLE_TARGETS} APPEND FILE "${DCMTK_BUILD_CMKDIR}/DCMTKTargets.cmake")
 
 # Get and store libraries to DCMTKTargets.cmake within the build's main dir
 get_property(DCMTK_LIBRARY_TARGETS GLOBAL PROPERTY DCMTK_LIBRARY_TARGETS)

diff --git a/CMake/GenerateDCMTKConfigure.cmake b/CMake/GenerateDCMTKConfigure.cmake
@@ -66,7 +66,7 @@ if(NOT DCMTK_ENABLE_CHARSET_CONVERSION)
   set(DCMTK_ENABLE_CHARSET_CONVERSION_DOCSTRING "Select character set conversion implementation.")
   if(DCMTK_WITH_ICONV)
     if(DCMTK_WITH_ICU)
-      message(WARNING "Warning: Both ICU and the libiconv are available, using libiconv. Modify DCMTK_ENABLE_CHARSET_CONVERSION for switching to ICU")
+      message(STATUS "Info: Both ICU and the libiconv are available, using libiconv. Modify DCMTK_ENABLE_CHARSET_CONVERSION for switching to ICU")
     endif()
     set(DCMTK_ENABLE_CHARSET_CONVERSION "libiconv" CACHE STRING "${DCMTK_ENABLE_CHARSET_CONVERSION_DOCSTRING}")
   elseif(DCMTK_WITH_ICU)