Qt6 cmake fixes

psi-im · Mar 16, 2024 · 8fdf688 · 8fdf688
1 parent 99d930b
commit 8fdf688
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cmake/modules/FindQca.cmake b/cmake/modules/FindQca.cmake
@@ -34,11 +34,11 @@ if (Qca_INCLUDE_DIR AND Qca_LIBRARY)
 endif()
 
 set(EXTRA_PATH_SUFFIXES
-    qt5/Qca-qt5/QtCrypto
-    Qca-qt5/QtCrypto
+    qt5/Qca-qt${QT_DEFAULT_MAJOR_VERSION}/QtCrypto
+    Qca-qt${QT_DEFAULT_MAJOR_VERSION}/QtCrypto
     qt5/QtCrypto
-    qt/Qca-qt5/QtCrypto
-    lib/qca-qt5.framework/Versions/2/Headers
+    qt/Qca-qt${QT_DEFAULT_MAJOR_VERSION}/QtCrypto
+    lib/qca-qt${QT_DEFAULT_MAJOR_VERSION}.framework/Versions/2/Headers
 )
 
 find_path(
@@ -52,7 +52,7 @@ find_path(
 
 find_library(
     Qca_LIBRARY
-    NAMES qca-qt5${D}
+    NAMES qca-qt${QT_DEFAULT_MAJOR_VERSION}${D}
     HINTS
     ${QCA_DIR}/lib
     ${QCA_DIR}/bin

diff --git a/cmake/modules/IrisQCA.cmake b/cmake/modules/IrisQCA.cmake
@@ -13,8 +13,8 @@ if(IRIS_BUNDLED_QCA)
     else()
         list(APPEND Qca_INCLUDE_DIR ${QCA_SOURCE_DIR}/include/QtCrypto)
     endif()
-    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt${QT_DEFAULT_MAJOR_VERSION}${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt${QT_DEFAULT_MAJOR_VERSION}/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
     if(APPLE)
         set(COREFOUNDATION_LIBRARY "-framework CoreFoundation")