pcre2-config.cmake.in: Fix PCRE2 library names

Fix library names for 16bit, 32bit and posix which incorrectly points to 8bit. Also add IMPORTED_IMPLIB to fix https://bugreports.qt.io/browse/QTBUG-117907
PCRE2Project · Dec 28, 2023 · 34b0d72 · 34b0d72
1 parent aadef0c
commit 34b0d72
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/cmake/pcre2-config.cmake.in b/cmake/pcre2-config.cmake.in
@@ -52,15 +52,11 @@ else ()
   endif ()
 endif ()
 find_library(PCRE2_8BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit PCRE2 library")
-find_library(PCRE2_16BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "16 bit PCRE2 library")
-find_library(PCRE2_32BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "32 bit PCRE2 library")
-find_library(PCRE2_POSIX_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_8BIT_NAME}d${PCRE2_SUFFIX} DOC "8 bit POSIX PCRE2 library")
+find_library(PCRE2_16BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_16BIT_NAME}d${PCRE2_SUFFIX} DOC "16 bit PCRE2 library")
+find_library(PCRE2_32BIT_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_32BIT_NAME}d${PCRE2_SUFFIX} DOC "32 bit PCRE2 library")
+find_library(PCRE2_POSIX_LIBRARY NAMES ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}${PCRE2_SUFFIX} ${PCRE2_PREFIX}${PCRE2_POSIX_NAME}d${PCRE2_SUFFIX} DOC "8 bit POSIX PCRE2 library")
 unset(PCRE2_NON_STANDARD_LIB_PREFIX)
 unset(PCRE2_NON_STANDARD_LIB_SUFFIX)
-unset(PCRE2_8BIT_NAME)
-unset(PCRE2_16BIT_NAME)
-unset(PCRE2_32BIT_NAME)
-unset(PCRE2_POSIX_NAME)
 
 # Set version
 if (PCRE2_INCLUDE_DIR)
@@ -126,6 +122,7 @@ if (PCRE2_FOUND)
     endif ()
     set_target_properties(PCRE2::${component} PROPERTIES
       IMPORTED_LOCATION "${PCRE2_${component}_LIBRARY}"
+      IMPORTED_IMPLIB "${PCRE2_${component}_LIBRARY}"
       INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}"
     )
     if (component STREQUAL "POSIX")
@@ -140,6 +137,11 @@ if (PCRE2_FOUND)
   endforeach()
 endif ()
 
+unset(PCRE2_8BIT_NAME)
+unset(PCRE2_16BIT_NAME)
+unset(PCRE2_32BIT_NAME)
+unset(PCRE2_POSIX_NAME)
+
 mark_as_advanced(
   PCRE2_INCLUDE_DIR
 )