fix Qt6 build system

mhogomchungu · Aug 2, 2024 · b4d88a3 · b4d88a3
1 parent 3e3d2f1
commit b4d88a3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -281,6 +281,22 @@ if( NOT NOGUI )
 	if(BUILD_WITH_QT6)
 		find_package(Qt6 COMPONENTS Core Widgets Network REQUIRED )
 		message("-- Building With Qt6")
+		set(BUILD_WITH_QT6 ON)
+
+		set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+		set(CMAKE_AUTOMOC ON)
+		set(CMAKE_AUTORCC ON)
+		set(CMAKE_AUTOUIC ON)
+
+		message( STATUS "Found Qt6Widgets, version  ${Qt6Widgets_VERSION}" )
+		message( STATUS "Found Qt6Core, version  ${Qt6Core_VERSION}" )
+		message( STATUS "Found Qt6Network, version  ${Qt6Network_VERSION}" )
+
+		set( CMAKE_INCLUDE_CURRENT_DIR ON )
+		include_directories( ${Qt6Widgets_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS} ${Qt6Core_INCLUDE_DIRS} )
+
+		add_definitions( ${Qt6Widgets_DEFINITIONS} )
 	else()
 		find_package(Qt5 COMPONENTS Core QUIET)
 		if(Qt5_FOUND)

diff --git a/external_libraries/lxqt_wallet/frontend/CMakeLists.txt b/external_libraries/lxqt_wallet/frontend/CMakeLists.txt
@@ -85,11 +85,9 @@ else()
 endif()
 
 if( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0)
-	set( CMAKE_CXX_STANDARD 20 )
-	MESSAGE( STATUS "Setting C++ version to C++20" )
+	set( CMAKE_CXX_STANDARD 14 )
 else()
 	set( CMAKE_CXX_STANDARD 14 )
-	MESSAGE( STATUS "Setting C++ version to C++14" )
 endif()
 
 set( CMAKE_CXX_STANDARD_REQUIRED ON )

diff --git a/external_libraries/tasks/CMakeLists.txt b/external_libraries/tasks/CMakeLists.txt
@@ -13,10 +13,8 @@ add_definitions( -Wextra -Wall -pedantic )
 
 if( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0)
 	set( CMAKE_CXX_STANDARD 14 )
-	MESSAGE( STATUS "Setting C++ version to C++14" )
 else()
 	set( CMAKE_CXX_STANDARD 14 )
-	MESSAGE( STATUS "Setting C++ version to C++14" )
 endif()
 
 set( CMAKE_CXX_STANDARD_REQUIRED ON )

diff --git a/zuluCrypt-gui/sharedObjects/CMakeLists.txt b/zuluCrypt-gui/sharedObjects/CMakeLists.txt
@@ -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 ${SHARED_OBJ_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 )