cleaning up how our cmake files are organized. No more need to manual…

…ly use the

qt5_wrap_* functions, since we can have cmake automagically moc, uic, etc...

CMakeLists.txt

@@ -35,14 +35,13 @@ set_property(GLOBAL PROPERTY VERSION ${TARGET_VERSION_MAJOR}.${TARGET_VERSION_MI
 
 
 if (UNIX)
-# TODO(eteran): how low can we make this
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(GRAPHVIZ libgvc>=2.38.0)
-  if(${GRAPHVIZ_FOUND})
-    include_directories(${GRAPHVIZ_INCLUDE_DIRS})
-    link_directories(${GRAPHVIZ_LIBRARY_DIRS})
-    add_definitions(-DENABLE_GRAPH)
-  endif()
+	find_package(PkgConfig REQUIRED)
+	pkg_check_modules(GRAPHVIZ libgvc>=2.38.0)
+	if(${GRAPHVIZ_FOUND})
+		include_directories(${GRAPHVIZ_INCLUDE_DIRS})
+		link_directories(${GRAPHVIZ_LIBRARY_DIRS})
+		add_definitions(-DENABLE_GRAPH)
+	endif()
 endif()
 
 
@@ -53,7 +52,7 @@ include_directories("include")
 if(UNIX)
 	include_directories("include/os/unix")
 elseif(WIN32)
-  include_directories("include/os/win32")
+	include_directories("include/os/win32")
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

plugins/Analyzer/CMakeLists.txt

@@ -8,28 +8,22 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "Analyzer")
 
-set(UI_FILES
-		OptionsPage.ui
-		SpecifiedFunctions.ui
-		DialogXRefs.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets Concurrent)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
-	Analyzer.h
-	AnalyzerWidget.h
-	OptionsPage.h
-	SpecifiedFunctions.h
 	Analyzer.cpp
+	Analyzer.h
 	AnalyzerWidget.cpp
-	OptionsPage.cpp
-	SpecifiedFunctions.cpp
+	AnalyzerWidget.h
 	DialogXRefs.cpp
 	DialogXRefs.h
-	${UI_H}
+	DialogXRefs.ui
+	OptionsPage.cpp
+	OptionsPage.h
+	OptionsPage.ui
+	SpecifiedFunctions.cpp
+	SpecifiedFunctions.h
+	SpecifiedFunctions.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets Qt5::Concurrent)

plugins/Assembler/CMakeLists.txt

@@ -8,26 +8,18 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "Assembler")
 
-set(UI_FILES
-		DialogAssembler.ui
-		OptionsPage.ui)
-set(RC_FILES Assembler.qrc)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets Xml XmlPatterns)
-qt5_wrap_ui(UI_H ${UI_FILES})
-qt5_add_resources(RC_SRCS ${RC_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	Assembler.cpp
 	Assembler.h
+	Assembler.qrc
 	DialogAssembler.cpp
 	DialogAssembler.h
+	DialogAssembler.ui
 	OptionsPage.cpp
 	OptionsPage.h
-	${RC_SRCS}
-	${UI_H}
+	OptionsPage.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets Qt5::Xml Qt5::XmlPatterns)

plugins/Backtrace/CMakeLists.txt

@@ -8,22 +8,16 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "Backtrace")
 
-set(UI_FILES
-		DialogBacktrace.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	Backtrace.cpp
 	Backtrace.h
-	DialogBacktrace.cpp
-	DialogBacktrace.h
 	CallStack.cpp
 	CallStack.h
-	${UI_H}
+	DialogBacktrace.cpp
+	DialogBacktrace.h
+	DialogBacktrace.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)

plugins/BinaryInfo/CMakeLists.txt

@@ -8,33 +8,27 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "BinaryInfo")
 
-set(UI_FILES
-		OptionsPage.ui
-		DialogHeader.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	BinaryInfo.cpp
 	BinaryInfo.h
 	demangle.h
 	DialogHeader.cpp
 	DialogHeader.h
-	ELFXX.cpp
+	DialogHeader.ui
 	ELF32.cpp
 	ELF64.cpp
 	elf_binary.h
+	ELFXX.cpp
 	OptionsPage.cpp
 	OptionsPage.h
+	OptionsPage.ui
 	PE32.cpp
 	PE32.h
 	pe_binary.h
 	symbols.cpp
 	symbols.h
-	${UI_H}
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)

plugins/BinarySearcher/CMakeLists.txt

@@ -8,23 +8,17 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "BinarySearcher")
 
-set(UI_FILES
-		DialogASCIIString.ui
-		DialogBinaryString.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	BinarySearcher.cpp
 	BinarySearcher.h
 	DialogASCIIString.cpp
 	DialogASCIIString.h
+	DialogASCIIString.ui
 	DialogBinaryString.cpp
 	DialogBinaryString.h
-	${UI_H}
+	DialogBinaryString.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)

plugins/Bookmarks/CMakeLists.txt

@@ -8,22 +8,16 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "Bookmarks")
 
-set(UI_FILES
-		Bookmarks.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	Bookmarks.cpp
 	Bookmarks.h
 	BookmarkWidget.cpp
 	BookmarkWidget.h
 	BookmarksModel.cpp
 	BookmarksModel.h
-	${UI_H}
+	Bookmarks.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)

plugins/BreakpointManager/CMakeLists.txt

@@ -8,20 +8,14 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "BreakpointManager")
 
-set(UI_FILES
-		DialogBreakpoints.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	BreakpointManager.cpp
 	BreakpointManager.h
 	DialogBreakpoints.cpp
 	DialogBreakpoints.h
-	${UI_H}
+	DialogBreakpoints.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)

plugins/CheckVersion/CMakeLists.txt

@@ -8,20 +8,14 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "CheckVersion")
 
-set(UI_FILES
-		OptionsPage.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets Network)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	CheckVersion.cpp
 	CheckVersion.h
 	OptionsPage.cpp
 	OptionsPage.h
-	${UI_H}
+	OptionsPage.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets Qt5::Network)

plugins/DebuggerCore/CMakeLists.txt

@@ -10,16 +10,7 @@ set(PluginName "DebuggerCore")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-
-set(UI_FILES
-	unix/linux/DialogMemoryAccess.ui
-)
-
-endif()
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
 set(DebuggerCore_SRCS
 	DebuggerCoreBase.cpp
@@ -48,6 +39,11 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 		${DebuggerCore_SRCS}
 		unix/linux/DebuggerCore.cpp
 		unix/linux/DebuggerCore.h
+		unix/linux/DialogMemoryAccess.cpp
+		unix/linux/DialogMemoryAccess.h
+		unix/linux/DialogMemoryAccess.ui
+		unix/linux/FeatureDetect.cpp
+		unix/linux/FeatureDetect.h
 		unix/linux/PlatformCommon.cpp
 		unix/linux/PlatformCommon.h
 		unix/linux/PlatformEvent.cpp
@@ -58,32 +54,26 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 		unix/linux/PlatformRegion.h
 		unix/linux/PlatformThread.cpp
 		unix/linux/PlatformThread.h	
-		unix/linux/FeatureDetect.cpp
-		unix/linux/FeatureDetect.h
-		unix/linux/DialogMemoryAccess.cpp
-		unix/linux/DialogMemoryAccess.h
-		${UI_H}
 	)
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
-  include_directories(
-    "win32"
-  )
-
-  set(DebuggerCore_SRCS
-    ${DebuggerCore_SRCS}
-    win32/DebuggerCore.cpp
-    win32/DebuggerCore.h
-    win32/PlatformEvent.cpp
-    win32/PlatformEvent.h
-    win32/PlatformProcess.cpp
-    win32/PlatformProcess.h
-    win32/PlatformRegion.cpp
-    win32/PlatformRegion.h
-    win32/PlatformState.cpp
-    win32/PlatformState.h
-    ${UI_H}
-  )
+	include_directories(
+		"win32"
+	)
+
+	set(DebuggerCore_SRCS
+		${DebuggerCore_SRCS}
+		win32/DebuggerCore.cpp
+		win32/DebuggerCore.h
+		win32/PlatformEvent.cpp
+		win32/PlatformEvent.h
+		win32/PlatformProcess.cpp
+		win32/PlatformProcess.h
+		win32/PlatformRegion.cpp
+		win32/PlatformRegion.h
+		win32/PlatformState.cpp
+		win32/PlatformState.h
+	)
 endif()
 
 if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3456]86") OR (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") OR (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64"))

plugins/DebuggerErrorConsole/CMakeLists.txt

@@ -10,8 +10,6 @@ set(PluginName "DebuggerErrorConsole")
 
 find_package(Qt5 5.0.0 REQUIRED Widgets)
 
-# we put the header files from the include directory here
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	Plugin.cpp
 	Plugin.h

plugins/DumpState/CMakeLists.txt

@@ -8,20 +8,14 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "DumpState")
 
-set(UI_FILES
-		OptionsPage.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	DumpState.cpp
 	DumpState.h
 	OptionsPage.cpp
 	OptionsPage.h
-	${UI_H}
+	OptionsPage.ui
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)

plugins/FunctionFinder/CMakeLists.txt

@@ -8,20 +8,14 @@ set(CMAKE_AUTORCC ON)
 
 set(PluginName "FunctionFinder")
 
-set(UI_FILES
-		DialogFunctions.ui)
-
 find_package(Qt5 5.0.0 REQUIRED Widgets)
-qt5_wrap_ui(UI_H ${UI_FILES})
 
-# we put the header files from the include directory here 
-# too so automoc can "just work"
 add_library(${PluginName} SHARED
 	DialogFunctions.cpp
 	DialogFunctions.h
+	DialogFunctions.ui
 	FunctionFinder.cpp
 	FunctionFinder.h
-	${UI_H}
 )
 
 target_link_libraries(${PluginName} Qt5::Widgets)