Fix the QT_INSTALL_PREFIX not found error (#146)

* Change QT_VERSION_MAJOR to QT_MAJOR_VERSION
matinlotfali · Jan 21, 2024 · fcb6924 · fcb6924
1 parent a333259
commit fcb6924
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(kwin4_effect_shapecorners)
 
 set(KF_MIN_VERSION "5.78")
 set(QT_MIN_VERSION "5.15")
-set(QT_VERSION_MAJOR 5)
+set(QT_MAJOR_VERSION 5)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -23,7 +23,7 @@ set(CMAKE_MODULE_PATH
 )
 if(ECM_VERSION VERSION_GREATER "5.200.0")
     set(QT_MIN_VERSION "6.4.0")
-    set(QT_VERSION_MAJOR 6)
+    set(QT_MAJOR_VERSION 6)
 endif()
 
 include(FeatureSummary)
@@ -32,11 +32,11 @@ include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 
 # required frameworks by Core
-find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
     ConfigWidgets
 )
-if(${QT_VERSION_MAJOR} EQUAL 6)
-    find_package(KF${QT_VERSION_MAJOR} ${KF_MIN_VERSION} REQUIRED COMPONENTS
+if(${QT_MAJOR_VERSION} EQUAL 6)
+    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
             KCMUtils
     )
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -12,13 +12,13 @@ kconfig_add_kcfg_files(effect_SRCS ShapeCornersConfig.kcfgc)
 kcoreaddons_add_plugin(kwin4_effect_shapecorners SOURCES ${effect_SRCS} INSTALL_NAMESPACE "kwin/effects/plugins/")
 
 target_link_libraries(kwin4_effect_shapecorners
-    Qt${QT_VERSION_MAJOR}::DBus
-    KF${QT_VERSION_MAJOR}::ConfigGui
+    Qt${QT_MAJOR_VERSION}::DBus
+    KF${QT_MAJOR_VERSION}::ConfigGui
 )
-if(${QT_VERSION_MAJOR} EQUAL 6)
+if(${QT_MAJOR_VERSION} EQUAL 6)
     target_link_libraries(kwin4_effect_shapecorners
             KWin::kwin
-            Qt${QT_VERSION_MAJOR}::CorePrivate
+            Qt${QT_MAJOR_VERSION}::CorePrivate
     )
 else()
     target_link_libraries(kwin4_effect_shapecorners

diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt
@@ -6,14 +6,14 @@ set(kcm_SRCS
 
 kconfig_add_kcfg_files(kcm_SRCS ../ShapeCornersConfig.kcfgc)
 
-if(${QT_VERSION_MAJOR} EQUAL 6)
+if(${QT_MAJOR_VERSION} EQUAL 6)
     qt6_wrap_ui(kcm_SRCS ShapeCornersKCM.ui)
     qt6_add_dbus_interface(kcm_SRCS ${KWIN_EFFECTS_INTERFACE} kwineffects_interface)
     kcoreaddons_add_plugin(kwin_shapecorners_config INSTALL_NAMESPACE "kwin/effects/configs" SOURCES ${kcm_SRCS})
 
     target_link_libraries(kwin_shapecorners_config
-            Qt${QT_VERSION_MAJOR}::CorePrivate
-            KF${QT_VERSION_MAJOR}::KCMUtils
+            Qt${QT_MAJOR_VERSION}::CorePrivate
+            KF${QT_MAJOR_VERSION}::KCMUtils
     )
 else()
     qt5_wrap_ui(kcm_SRCS ShapeCornersKCM.ui)
@@ -22,6 +22,6 @@ else()
 endif ()
 
 target_link_libraries(kwin_shapecorners_config
-    Qt${QT_VERSION_MAJOR}::DBus
-    KF${QT_VERSION_MAJOR}::ConfigWidgets
-)
+    Qt${QT_MAJOR_VERSION}::DBus
+    KF${QT_MAJOR_VERSION}::ConfigWidgets
+)