svn commit: r1920852 - /apr/apr/trunk/CMakeLists.txt

Author: ivan
Date: Mon Sep 23 09:01:54 2024
New Revision: 1920852

URL: http://svn.apache.org/viewvc?rev=1920852&view=rev
Log:
CMake: Use imported targets for Iconv library.

Modified:
    apr/apr/trunk/CMakeLists.txt

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1920852&r1=1920851&r2=1920852&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Mon Sep 23 09:01:54 2024
@@ -149,10 +149,8 @@ ELSEIF(APU_USE_XMLLITE)
 ENDIF()
 
 IF(APU_HAVE_ICONV)
-  SET(XLATE_INCLUDE_DIR ${Iconv_INCLUDE_DIRS})
-  SET(XLATE_LIBRARIES   ${Iconv_LIBRARIES})
+  SET(XLATE_LIBRARIES    Iconv::Iconv)
 ELSE()
-  SET(XLATE_INCLUDE_DIR "")
   SET(XLATE_LIBRARIES   "")
 ENDIF()
 # Generated .h files are stored in PROJECT_BINARY_DIR, not the
@@ -550,7 +548,7 @@ IF (BUILD_SHARED_LIBS)
                              PRIVATE "APR_DECLARE_EXPORT"
                              INTERFACE "APR_DECLARE_IMPORT")
   TARGET_INCLUDE_DIRECTORIES(${apr_libname}
-    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XLATE_INCLUDE_DIR}
+    PRIVATE ${APR_INCLUDE_DIRECTORIES}
     INTERFACE $<INSTALL_INTERFACE:${APR_INSTALL_INCLUDE_DIR}> ${APR_INCLUDE_DIRECTORIES}
   )
   ADD_DEPENDENCIES(${apr_libname} test_char_header)
@@ -564,7 +562,7 @@ ELSE()
                              PRIVATE "APR_DECLARE_STATIC"
                              INTERFACE "APR_DECLARE_STATIC")
   TARGET_INCLUDE_DIRECTORIES(${apr_libname}
-    PRIVATE ${APR_INCLUDE_DIRECTORIES} ${XLATE_INCLUDE_DIR}
+    PRIVATE ${APR_INCLUDE_DIRECTORIES}
     INTERFACE $<INSTALL_INTERFACE:${APR_INSTALL_INCLUDE_DIR}> ${APR_INCLUDE_DIRECTORIES}
   )
   ADD_DEPENDENCIES(${apr_libname} test_char_header)