Replace call QT5_WRAP_UI with CMAKE_AUTOUIC (#7200)

cmake/modules/BuildPlugin.cmake

@@ -1,12 +1,12 @@
 # BuildPlugin.cmake - Copyright (c) 2008 Tobias Doerffel
 #
 # description: build LMMS-plugin
-# usage: BUILD_PLUGIN(<PLUGIN_NAME> <PLUGIN_SOURCES> MOCFILES <HEADERS_FOR_MOC> EMBEDDED_RESOURCES <LIST_OF_FILES_TO_EMBED> UICFILES <UI_FILES_TO_COMPILE> LINK <SHARED|MODULE>)
+# usage: BUILD_PLUGIN(<PLUGIN_NAME> <PLUGIN_SOURCES> MOCFILES <HEADERS_FOR_MOC> EMBEDDED_RESOURCES <LIST_OF_FILES_TO_EMBED> LINK <SHARED|MODULE>)
 
 INCLUDE(GenQrc)
 
 MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
@@ -31,10 +31,9 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	ENDIF(ER_LEN)
 
 	QT5_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
-	QT5_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
 
 	FOREACH(f ${PLUGIN_SOURCES})
-		ADD_FILE_DEPENDENCIES(${f} ${RCC_OUT} ${plugin_UIC_out})
+		ADD_FILE_DEPENDENCIES(${f} ${RCC_OUT})
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)

plugins/GigPlayer/CMakeLists.txt

@@ -1,6 +1,7 @@
 if(LMMS_HAVE_GIG)
 	INCLUDE(BuildPlugin)
 	INCLUDE_DIRECTORIES(${GIG_INCLUDE_DIRS})
+	SET(CMAKE_AUTOUIC ON)
 
 	# Required for not crashing loading files with libgig
 	SET(GCC_COVERAGE_COMPILE_FLAGS "-fexceptions")
@@ -17,7 +18,6 @@ if(LMMS_HAVE_GIG)
 	build_plugin(gigplayer
 		GigPlayer.cpp GigPlayer.h PatchesDialog.cpp PatchesDialog.h PatchesDialog.ui
 		MOCFILES GigPlayer.h PatchesDialog.h
-		UICFILES PatchesDialog.ui
 		EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
 	)
 	target_link_libraries(gigplayer SampleRate::samplerate)

plugins/Sf2Player/CMakeLists.txt

@@ -1,9 +1,9 @@
 if(LMMS_HAVE_FLUIDSYNTH)
+	SET(CMAKE_AUTOUIC ON)
 	include(BuildPlugin)
 	build_plugin(sf2player
 		Sf2Player.cpp Sf2Player.h PatchesDialog.cpp PatchesDialog.h PatchesDialog.ui
 		MOCFILES Sf2Player.h PatchesDialog.h
-		UICFILES PatchesDialog.ui
 		EMBEDDED_RESOURCES *.png
 	)
 	target_link_libraries(sf2player fluidsynth SampleRate::samplerate)

src/CMakeLists.txt

@@ -4,9 +4,9 @@ CONFIGURE_FILE("lmmsconfig.h.in"        "${CMAKE_BINARY_DIR}/lmmsconfig.h")
 CONFIGURE_FILE("lmmsversion.h.in"       "${CMAKE_BINARY_DIR}/lmmsversion.h")
 
 SET(LMMS_SRCS "")
-SET(LMMS_UIS "")
 
 SET(CMAKE_AUTOMOC ON)
+SET(CMAKE_AUTOUIC ON)
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # Enable C++17
@@ -23,7 +23,6 @@ ADD_SUBDIRECTORY(tracks)
 
 LIST(APPEND LMMS_SRCS ${LMMS_COMMON_SRCS})
 
-QT5_WRAP_UI(LMMS_UI_OUT ${LMMS_UIS})
 INCLUDE_DIRECTORIES(
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	"${CMAKE_BINARY_DIR}"
@@ -100,7 +99,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ADD_LIBRARY(lmmsobjs OBJECT
 	${LMMS_SRCS}
 	${LMMS_INCLUDES}
-	${LMMS_UI_OUT}
 	${LMMS_RCC_OUT}
 )
 
@@ -134,7 +132,7 @@ IF(NOT CMAKE_VERSION VERSION_LESS 3.6)
 	SET_PROPERTY(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lmms)
 ENDIF()
 
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} lmmsconfig.h lmms.1.gz")
 
 IF(LMMS_BUILD_WIN32)
 	SET(EXTRA_LIBRARIES "winmm")
@@ -212,6 +210,8 @@ set_target_properties(lmms PROPERTIES
 	WIN32_EXECUTABLE $<NOT:$<CONFIG:DEBUG>>
 )
 
+set_target_properties(lmmsobjs PROPERTIES AUTOUIC_SEARCH_PATHS "gui/modals")
+
 IF(LMMS_BUILD_MSYS)
 	# ENABLE_EXPORTS property has no effect in some MSYS2 configurations.
 	# Add the linker flag manually to create liblmms.dll.a import library

src/gui/CMakeLists.txt

@@ -131,10 +131,3 @@ SET(LMMS_SRCS
 	PARENT_SCOPE
 )
 
-set(LMMS_UIS
-	${LMMS_UIS}
-	gui/modals/about_dialog.ui
-	gui/modals/export_project.ui
-
-	PARENT_SCOPE
-)