feat: 4.0 development

Author: Dax89

.gitmodules

@@ -1,233 +1,100 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(REDasm)
+project(redasm-gui)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-include(${CMAKE_SOURCE_DIR}/LibREDasm/cmake/sanitizers.cmake)
-
-string(TIMESTAMP REDASM_BUILD_TIMESTAMP "%Y%m%d")
-set(REDASM_GIT_VERSION "unknown")
-set(REDASM_VERSION_BASE "3.0-BETA7")
-
-find_package(Git)
-find_package(Qt6 COMPONENTS Widgets)
-
-if(NOT Qt6_FOUND)
-    find_package(Qt5 REQUIRED COMPONENTS Widgets)
-    find_package(Qt5LinguistTools)
-endif()
-
-include(LibREDasm/cmake/get_cpm.cmake)
-
-if(GIT_FOUND)
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                    OUTPUT_VARIABLE REDASM_GIT_VERSION
-                    ERROR_QUIET
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-else()
-    message(STATUS "Git not found, setting version to ${REDASM_GIT_VERSION}")
+if(NOT TARGET redasm::redasm)
+    find_package(redasm REQUIRED)
 endif()
 
-set(REDASM_BUILD_VERSION "${REDASM_BUILD_TIMESTAMP}.${REDASM_GIT_VERSION}")
-add_definitions(-DREDASM_VERSION="${REDASM_VERSION_BASE} \(${REDASM_BUILD_VERSION}\)")
-
-if(Qt6_FOUND)
-    set(KDDOCKWIDGETS_OPTIONS "KDDockWidgets_QT6 ON"
-                              "KDDockWidgets_STATIC ON"
-                              "KDDockWidgets_EXAMPLES OFF"
-                              "KDDockWidgets_UNITY_BUILD OFF")
-else()
-    set(KDDOCKWIDGETS_OPTIONS "KDDockWidgets_STATIC ON"
-                              "KDDockWidgets_EXAMPLES OFF"
-                              "KDDockWidgets_UNITY_BUILD OFF")
-endif()
-
-CPMAddPackage(
-    NAME KDDockWidgets
-    GIT_REPOSITORY https://github.com/KDAB/KDDockWidgets
-    VERSION 1.7.0
-    OPTIONS ${KDDOCKWIDGETS_OPTIONS}
-    EXCLUDE_FROM_ALL ON
-    )
-
-add_subdirectory(libs/qhexview EXCLUDE_FROM_ALL)
-add_subdirectory(LibREDasm)
-
-# FindREDasm.config
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/LibREDasm/rdapi")
-
-add_subdirectory(submodules/plugins)
-add_subdirectory(submodules/assemblers)
-add_subdirectory(submodules/loaders)
-add_subdirectory(submodules/database)
-qt_wrap_ui(UI_HDRS ${UI_FILES})
-
-# Widgets
-file(GLOB_RECURSE WIDGETS_HEADERS CONFIGURE_DEPENDS widgets/*.h )
-file(GLOB_RECURSE WIDGETS_SOURCES CONFIGURE_DEPENDS widgets/*.cpp)
-file(GLOB_RECURSE WIDGETS_UIS CONFIGURE_DEPENDS widgets/*.ui)
-
-# Dialogs
-file(GLOB_RECURSE DIALOGS_HEADERS CONFIGURE_DEPENDS dialogs/*.h)
-file(GLOB_RECURSE DIALOGS_SOURCES CONFIGURE_DEPENDS dialogs/*.cpp)
-file(GLOB_RECURSE DIALOGS_UIS CONFIGURE_DEPENDS dialogs/*.ui)
-
-# Models
-file(GLOB_RECURSE MODELS_HEADERS CONFIGURE_DEPENDS models/*.h)
-file(GLOB_RECURSE MODELS_SOURCES CONFIGURE_DEPENDS models/*.cpp)
-
-# Delegates
-file(GLOB_RECURSE DELEGATES_HEADERS CONFIGURE_DEPENDS delegates/*.h)
-file(GLOB_RECURSE DELEGATES_SOURCES CONFIGURE_DEPENDS delegates/*.cpp)
-
-# Renderer
-file(GLOB_RECURSE RENDERER_HEADERS CONFIGURE_DEPENDS renderer/*.h)
-file(GLOB_RECURSE RENDERER_SOURCES CONFIGURE_DEPENDS renderer/*.cpp)
-
-# Hooks
-file(GLOB_RECURSE HOOKS_HEADERS CONFIGURE_DEPENDS hooks/*.h)
-file(GLOB_RECURSE HOOKS_SOURCES CONFIGURE_DEPENDS hooks/*.cpp)
-
-# UI
-file(GLOB_RECURSE UI_HEADERS CONFIGURE_DEPENDS ui/*.h)
-file(GLOB_RECURSE UI_SOURCES CONFIGURE_DEPENDS ui/*.cpp)
-file(GLOB_RECURSE UI_UIS CONFIGURE_DEPENDS ui/*.ui)
-
-SET(HEADERS
-    ${REDASM_TEST_HEADERS}
-    ${WIDGETS_HEADERS}
-    ${DIALOGS_HEADERS}
-    ${MODELS_HEADERS}
-    ${DELEGATES_HEADERS}
-    ${HOOKS_HEADERS}
-    ${RENDERER_HEADERS}
-    ${UI_HEADERS}
-    mainwindow.h
-    themeprovider.h
-    redasmsettings.h
-    redasmfonts.h)
-
-SET(SOURCES
-    ${REDASM_TEST_SOURCES}
-    ${WIDGETS_SOURCES}
-    ${DIALOGS_SOURCES}
-    ${MODELS_SOURCES}
-    ${DELEGATES_SOURCES}
-    ${HOOKS_SOURCES}
-    ${RENDERER_SOURCES}
-    ${UI_SOURCES}
-    main.cpp
-    mainwindow.cpp
-    themeprovider.cpp
-    redasmsettings.cpp
-    redasmfonts.cpp)
-
-set(FORMS
-    ${WIDGETS_UIS}
-    ${DIALOGS_UIS}
-    ${UI_UIS})
-
-set(RESOURCES
-    resources.qrc
-    themes.qrc)
-
-if(WIN32)
-    set(GUI_TYPE WIN32)
-endif()
-
-set(ALL_SOURCES ${SOURCES} ${HEADERS} ${FORMS})
-
-if(QtLinguistTools_FOUND) # Prepare translations
-    message(STATUS "${PROJECT_NAME}: Adding multilanguage support")
-    qt_create_translation(QM_FILES ${ALL_SOURCES} translations/redasm_en.ts)
-    configure_file(translations.qrc ${CMAKE_BINARY_DIR} COPYONLY)
-    set(TRANSLATIONS_QRC ${CMAKE_BINARY_DIR}/translations.qrc)
-else()
-    message(STATUS "${PROJECT_NAME}: Multilanguage support NOT available")
-endif()
-
-add_executable(${PROJECT_NAME} ${GUI_TYPE} ${RESOURCES}
-               ${TRANSLATIONS_QRC} ${QM_FILES}
-               "${CMAKE_SOURCE_DIR}/res/windows/resources.rc")
-
-target_sources(${PROJECT_NAME} PRIVATE ${ALL_SOURCES})
-
-target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
-set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF)
-
-# TODO: refactor this to target_include_directories(target PUBLIC ...) in the submodules
-target_include_directories(${PROJECT_NAME} PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        LibREDasm
-        libs)
-
-target_link_libraries(${PROJECT_NAME} PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
-    KDAB::kddockwidgets
-    QHexView
-    LibREDasm)
-
-# Include Threads
-# TODO: perhaps this should be a PUBLIC dependency of LibREDasm?
-find_package(Threads REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-missing-braces)
-endif()
-
-string(TIMESTAMP REDASM_ARCHIVE_DATE "%Y%m%d")
-set(REDASM_ARCHIVE_NAME "${PROJECT_NAME}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}_${REDASM_ARCHIVE_DATE}.zip")
-set(REDASM_DEPLOY_DIR ${CMAKE_BINARY_DIR}/deploy)
-
-# Deploy Qt DLLs on Windows
-# https://stackoverflow.com/a/41199492/1806760
-if(Qt_FOUND AND WIN32 AND TARGET Qt::qmake AND NOT TARGET Qt::windeployqt)
-    get_target_property(_qt_qmake_location Qt::qmake IMPORTED_LOCATION)
-
-    execute_process(
-        COMMAND "${_qt_qmake_location}" -query QT_INSTALL_PREFIX
-        RESULT_VARIABLE return_code
-        OUTPUT_VARIABLE qt_install_prefix
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    set(_WINDEPLOYQT_EXECUTABLE "${qt_install_prefix}/bin/windeployqt.exe")
-
-    if(EXISTS ${_WINDEPLOYQT_EXECUTABLE})
-        set(WINDEPLOYQT_EXECUTABLE ${_WINDEPLOYQT_EXECUTABLE})
-    endif()
-endif()
-
-add_custom_command(OUTPUT REDasmPrePackage
-                   COMMAND ${CMAKE_COMMAND} --install . --prefix ${REDASM_DEPLOY_DIR} --config ${CMAKE_BUILD_TYPE}
-                   VERBATIM)
-
-if(WINDEPLOYQT_EXECUTABLE)
-    add_custom_command(OUTPUT REDasmPackage
-        WORKING_DIRECTORY ${REDASM_DEPLOY_DIR}
-        COMMAND ${WINDEPLOYQT_EXECUTABLE} .
-        #COMMAND ${CMAKE_COMMAND} -E tar cvf ../${REDASM_ARCHIVE_NAME} --format=zip .
-        DEPENDS REDasmPrePackage
-        VERBATIM)
-else()
-    add_custom_command(OUTPUT REDasmPackage
-        WORKING_DIRECTORY ${REDASM_DEPLOY_DIR}
-        #COMMAND ${CMAKE_COMMAND} -E tar cvf ../${REDASM_ARCHIVE_NAME} --format=zip .
-        DEPENDS REDasmPrePackage
-        VERBATIM)
-endif()
-
-add_custom_target(REDasmDeploy DEPENDS REDasmPackage)
-
-if(NOT WIN32)
-    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink submodules plugins)
-    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/submodules/database database)
-endif()
+include(cmake/Dependencies.cmake)
+setup_dependencies()
+
+qt_add_executable(${PROJECT_NAME})
+
+qt_add_resources(${PROJECT_NAME} "resources"
+    PREFIX /
+
+    FILES
+        res/fonts/FontAwesomeBrands6.otf
+        res/fonts/FontAwesomeSolid6.otf
+        res/themes/light.json
+        res/themes/dark.json
+        res/logo_dark.png
+        res/logo.png
+)
+
+include(cmake/Compiler.cmake)
+setup_compiler(${PROJECT_NAME})
+
+target_sources(${PROJECT_NAME} 
+    PRIVATE
+        src/delegates/recentfiles.cpp
+        src/dialogs/about.cpp
+        src/dialogs/analyzer.cpp
+        src/dialogs/detail.cpp
+        src/dialogs/flc.cpp
+        src/dialogs/goto.cpp
+        src/dialogs/loader.cpp
+        src/dialogs/memorymap.cpp
+        src/dialogs/settings.cpp
+        src/dialogs/table.cpp
+        src/hexview/flagsbuffer.cpp
+        src/models/exported.cpp
+        src/models/functions.cpp
+        src/models/imported.cpp
+        src/models/mappings.cpp
+        src/models/problems.cpp
+        src/models/recentfiles.cpp
+        src/models/references.cpp
+        src/models/segments.cpp
+        src/models/symbols.cpp
+        src/models/symbolsfilter.cpp
+        src/support/actions.cpp
+        src/support/fontawesome.cpp
+        src/support/settings.cpp
+        src/support/surfacerenderer.cpp
+        src/support/themeprovider.cpp
+        src/support/utils.cpp
+        src/views/graph/node.cpp
+        src/views/graph/view.cpp
+        src/views/split/view.cpp
+        src/views/split/widget.cpp
+        src/views/surface/graph/graph.cpp
+        src/views/surface/graph/node.cpp
+        src/views/surface/listing.cpp
+        src/views/surface/path.cpp
+        src/views/surface/popup.cpp
+        src/views/surface/split.cpp
+        src/views/surface/view.cpp
+        src/views/context.cpp
+        src/views/dashboard.cpp
+        src/views/log.cpp
+        src/views/welcome.cpp
+        src/main.cpp
+        src/mainwindow.cpp
+        src/statusbar.cpp
+)
+
+target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+      SHARED_OBJECT_EXT="${CMAKE_SHARED_LIBRARY_SUFFIX}"
+)
+
+target_include_directories(${PROJECT_NAME}
+    PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/src"
+)
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        Qt6::Widgets
+        redasm::redasm
+        QHexView
+)
+
+set_target_properties(${PROJECT_NAME}
+    PROPERTIES
+        WIN32_EXECUTABLE ON
+        MACOSX_BUNDLE ON
+)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${REDASM_INSTALL_BINDIR})