update build system to make it compile on Qt6

mhogomchungu · Jun 7, 2024 · b33bbdb · b33bbdb
1 parent 37be881
commit b33bbdb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/zuluCrypt-gui/CMakeLists.txt b/zuluCrypt-gui/CMakeLists.txt
@@ -32,7 +32,7 @@ set( UI_FILES createfile.ui
 		showluksslots.ui
 )
 
-set( MOC_FILES
+set( zuluCryptMOC_FILES
 		cryptoinfo.h
 		about.h
 		dialogok.h
@@ -87,7 +87,7 @@ set( SRC
 
 if(BUILD_WITH_QT6)
 
-	add_executable( zuluCrypt-gui ${MOC_FILES} ${UI_FILES} ${SRC} icon.qrc  )
+        add_executable( zuluCrypt-gui ${zuluCryptMOC_FILES} ${UI_FILES} ${SRC} icon.qrc  )
 
 	set_target_properties( zuluCrypt-gui PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}" )
 
@@ -102,7 +102,7 @@ else()
         INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
 
 	Qt5_WRAP_UI( UI ${UI_FILES} )
-	Qt5_WRAP_CPP( MOC ${MOC_FILES} )
+	Qt5_WRAP_CPP( MOC ${zuluCryptMOC_FILES} )
 	Qt5_ADD_RESOURCES( TRAY_RC_SRCS icon.qrc )
 
 	add_executable( zuluCrypt-gui ${MOC} ${UI} ${SRC} ${TRAY_RC_SRCS}  )

diff --git a/zuluCrypt-gui/sharedObjects/CMakeLists.txt b/zuluCrypt-gui/sharedObjects/CMakeLists.txt
@@ -26,7 +26,7 @@ set( SRC
 	../../zuluMount-gui/volumeproperty.cpp
 )
 
-set( MOC_FILES
+set( SHARED_OBJ_MOC_FILES
 	../dialogok.h
 	../dialogmsg.h
 	../readonlywarning.h
@@ -57,7 +57,7 @@ add_definitions( -D_FILE_OFFSET_BITS=64 -Wextra -Wall -pedantic -I${PROJECT_BINA
 
 if(BUILD_WITH_QT6)
 
-	add_library( sharedObject STATIC ${MOC_FILES} ${SRC} ${UI_FILES} icon.qrc )
+        add_library( sharedObject STATIC ${SHARED_OBJ_MOC_FILES} ${SRC} ${UI_FILES} icon.qrc )
 
 	if( BUILDKWALLET )
 		target_link_libraries( sharedObject -lgcrypt lxqt-wallet ${kwallet_library} -lblkid ${Qt6Network_LIBRARIES} mhogomchungu_task )
@@ -66,7 +66,7 @@ if(BUILD_WITH_QT6)
 	endif()
 else()
 	Qt5_WRAP_UI( UI ${UI_FILES} )
-	Qt5_WRAP_CPP( MOC ${MOC_FILES} )
+	Qt5_WRAP_CPP( MOC ${SHARED_OBJ_MOC_FILES} )
 	Qt5_ADD_RESOURCES( ICON icon.qrc )
 
 	add_library( sharedObject STATIC ${MOC} ${SRC} ${UI_FILES} ${ICON} )

diff --git a/zuluMount-gui/CMakeLists.txt b/zuluMount-gui/CMakeLists.txt
@@ -18,7 +18,7 @@ set (UI_FILES 	zulumount.ui
 		../zuluCrypt-gui/openvolume.ui
 )
 
-set(MOC_FILES 	zulumount.h
+set(zMOC_FILES 	zulumount.h
 		keydialog.h
 		mountpartition.h
 		oneinstance.h
@@ -58,7 +58,7 @@ if(BUILD_WITH_QT6)
 
 	add_definitions( ${Qt6Widgets_DEFINITIONS} )
 
-	add_executable( zuluMount-gui ${MOC_FILES} ${UI_FILES} ${SRC} icon.qrc )
+	add_executable( zuluMount-gui ${zMOC_FILES} ${UI_FILES} ${SRC} icon.qrc )
 
 	TARGET_LINK_LIBRARIES( zuluMount-gui sharedObject lxqt-wallet  ${Qt6Widgets_LIBRARIES} ${Qt6Core_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES} ${blkid} zuluCryptPluginManager )
 else()
@@ -68,7 +68,7 @@ else()
 
 	add_definitions( ${Qt5Widgets_DEFINITIONS} )
 	QT5_WRAP_UI( UI ${UI_FILES} )
-	QT5_WRAP_CPP(MOC ${MOC_FILES} )
+	QT5_WRAP_CPP(MOC ${zMOC_FILES} )
 	QT5_ADD_RESOURCES( TRAY_RC_SRCS icon.qrc )
 
 	add_executable( zuluMount-gui ${MOC} ${UI} ${SRC} ${TRAY_RC_SRCS} )