Fix conflicts in merging

Author: ChangLi27

.github/workflows/build.yml

@@ -2,13 +2,16 @@ name: DifferentialExpressionPlugin
 
 on:
   push:
+    branches:
+      - main
+      - 'release/**'
+      - 'feature/**'
   pull_request:
   workflow_dispatch:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
-  MACENABLED: ${{ inputs.forceMacBuild }}
 
 # for matrix check https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners
 jobs:
@@ -35,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout the source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           ref: ${{ github.event.pull_request.head.ref }}
@@ -51,7 +54,7 @@ jobs:
           python-version: "3.11"
 
       - name: Start ssh key agent
-        uses: webfactory/ssh-agent@v0.7.0
+        uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }}
 
@@ -61,8 +64,9 @@ jobs:
           key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }}
           known_hosts: github.com AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
 
+      # Build the package
       - name: Windows build
-        if: startsWith(runner.os, 'Windows')
+        if: startsWith(matrix.os, 'windows')
         uses: ManiVaultStudio/github-actions/conan_windows_build@main
         with:
           conan-visual-version: ${{matrix.build-cversion}}
@@ -73,7 +77,7 @@ jobs:
           conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
           rs_ssh_key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }}
 
-       - name: Linux build
+      - name: Linux build
         if: startsWith(matrix.os, 'ubuntu')
         uses: ManiVaultStudio/github-actions/conan_linuxmac_build@main
         with:
@@ -82,21 +86,23 @@ jobs:
           conan-libcxx-version: ${{matrix.build-libcxx}}
           conan-build-type: ${{matrix.build-config}}
           conan-build-os: ${{matrix.build-os}}
+          build-arch: ${{matrix.build-arch}}
           conan-user: ${{secrets.LKEB_UPLOAD_USER}}
           conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}}
           conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
           conan-cc: gcc-${{matrix.build-cversion}}
           conan-cxx: g++-${{matrix.build-cversion}}
-      
+
       - name: Mac build
-        if: startsWith(matrix.os, 'macos') 
+        if: startsWith(matrix.os, 'macos')
         uses: ManiVaultStudio/github-actions/conan_linuxmac_build@main
         with:
           conan-compiler: ${{matrix.build-compiler}}
           conan-compiler-version: ${{matrix.build-cversion}}
           conan-libcxx-version: ${{matrix.build-libcxx}}
           conan-build-type: ${{matrix.build-config}}
           conan-build-os: ${{matrix.build-os}}
+          build-arch: ${{matrix.build-arch}}
           conan-user: ${{secrets.LKEB_UPLOAD_USER}}
           conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}}
           conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}

CMakeLists.txt

@@ -3,50 +3,36 @@ cmake_minimum_required(VERSION 3.22)
 # -----------------------------------------------------------------------------
 # Differential Expression Plugin
 # -----------------------------------------------------------------------------
-PROJECT("DifferentialExpressionPlugin")
+PROJECT("DifferentialExpressionPlugin" 
+        LANGUAGES CXX)
 
 # -----------------------------------------------------------------------------
 # CMake Options
 # -----------------------------------------------------------------------------
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOMOC ON)
 
-if(MSVC)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")    
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
-endif(MSVC)
-
-# -----------------------------------------------------------------------------
-# Set install directory
-# -----------------------------------------------------------------------------
-# Check if the directory to the ManiVault installation has been provided
-# if(NOT DEFINED MV_INSTALL_DIR)
-    # set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is installed")
-    # message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is installed")
-# endif()
-# file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
+endif()
 
 # -----------------------------------------------------------------------------
 # Dependencies
 # -----------------------------------------------------------------------------
 find_package(Qt6 COMPONENTS Widgets WebEngineWidgets REQUIRED)
 
-find_package(ManiVault COMPONENTS Core PointData ClusterData CONFIG QUIET)
+find_package(ManiVault COMPONENTS Core PointData CONFIG QUIET)
 
-find_package(OpenMP)
+find_package(OpenMP REQUIRED)
 
-if(OpenMP_CXX_FOUND)
-    message(STATUS "Found OpenMP")
-endif()
 
 # -----------------------------------------------------------------------------
 # Source files
 # -----------------------------------------------------------------------------
-# Define the plugin sources
 
 set(MODEL
     src/TableModel.h
@@ -56,7 +42,6 @@ set(MODEL
 )
 
 set(WIDGETS
-    
     src/WordWrapHeaderView.h
     src/WordWrapHeaderView.cpp
     src/TableView.h
@@ -68,6 +53,8 @@ set(WIDGETS
 set(UTIL
     src/ProgressManager.h
     src/ProgressManager.cpp
+    src/AdditionalSettings.h
+    src/AdditionalSettings.cpp
 )
 
 set(ACTIONS
@@ -79,26 +66,13 @@ set(ACTIONS
 set(PLUGIN_SOURCES
     src/DifferentialExpressionPlugin.h
     src/DifferentialExpressionPlugin.cpp
-   
-    src/DifferentialExpressionPlugin.json
 )
 
-set(QRESOURCES
-    res/resources.qrc
+set(PLUGIN_SOURCES_AUX
+    PluginInfo.json
 )
-QT6_ADD_RESOURCES(RESOURCE_FILES ${QRESOURCES})
 
-set(PLUGIN_MOC_HEADERS
-    src/DifferentialExpressionPlugin.h
-
-    src/ButtonProgressBar.h
-    src/TableModel.h
-    src/TableSortFilterProxyModel.h
-    src/TableView.h
-    src/WordWrapHeaderView.h
-)
-
-source_group(Plugin FILES ${PLUGIN_SOURCES})
+source_group(Plugin FILES ${PLUGIN_SOURCES} ${PLUGIN_SOURCES_AUX})
 source_group(Model FILES ${MODEL})
 source_group(Actions FILES ${ACTIONS})
 source_group(Widget FILES ${WIDGETS})
@@ -108,19 +82,7 @@ source_group(Util FILES ${UTIL})
 # CMake Target
 # -----------------------------------------------------------------------------
 # Create dynamic library for the plugin
-add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${RESOURCE_FILES} ${UTIL} ${WIDGETS} ${MODEL} ${ACTIONS})
-
-# find_package(OpenMP REQUIRED)
-# if(OpenMP_FOUND)
-	# message(STATUS "OpenMP found")
-	# target_link_libraries(${PROJECT_NAME} PRIVATE OpenMP::OpenMP_CXX)
-	# target_compile_options(${PROJECT_NAME} PRIVATE ${OpenMP_CXX_FLAGS})
-# else()
-   # message(WARNING "OpenMP not found!")
-# endif()
-
-# qt_wrap_cpp(PLUGIN_MOC ${PLUGIN_MOC_HEADERS} TARGET ${PROJECT_NAME})
-# target_sources(${PROJECT_NAME} PRIVATE ${PLUGIN_MOC})
+add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${PLUGIN_SOURCES_AUX} ${UTIL} ${WIDGETS} ${MODEL} ${ACTIONS})
 
 # -----------------------------------------------------------------------------
 # Target include directories
@@ -133,6 +95,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "${ManiVault_INCLUDE_DIR}")
 # -----------------------------------------------------------------------------
 
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
+
 if(MV_UNITY_BUILD)
     set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ON)
 endif()
@@ -146,17 +109,13 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::WebEngineWidgets)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ManiVault::Core)
 target_link_libraries(${PROJECT_NAME} PRIVATE ManiVault::PointData)
-target_link_libraries(${PROJECT_NAME} PRIVATE ManiVault::ClusterData)
-
-if(OpenMP_CXX_FOUND)
-    target_link_libraries(${PROJECT_NAME} PRIVATE OpenMP::OpenMP_CXX)
-endif()
 
+target_link_libraries(${PROJECT_NAME} PRIVATE OpenMP::OpenMP_CXX)
 
 # -----------------------------------------------------------------------------
 # Target installation
 # -----------------------------------------------------------------------------
-# Install the shared plugin libary to the "Plugins" folder in the ManiVault install directory
+# Install the shared plugin library to the "Plugins" folder in the ManiVault install directory
 install(TARGETS ${PROJECT_NAME}
     RUNTIME DESTINATION Plugins COMPONENT PLUGINS # Windows .dll
     LIBRARY DESTINATION Plugins COMPONENT PLUGINS # Linux/Mac .so
@@ -166,20 +125,19 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
     COMMAND "${CMAKE_COMMAND}"
         --install ${CMAKE_CURRENT_BINARY_DIR}
         --config $<CONFIGURATION>
-        --prefix ${MV_INSTALL_DIR}/$<CONFIGURATION>
+        --component PLUGINS
+        --prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
 )
 
-set_target_properties(${PROJECT_NAME}
-    PROPERTIES
-    FOLDER ViewPlugins
-)
+mv_handle_plugin_config(${PROJECT_NAME})
 
 
 # -----------------------------------------------------------------------------
 # Miscellaneous
 # -----------------------------------------------------------------------------
 # Automatically set the debug environment (command + working directory) for MSVC
-if(MSVC)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
     set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
 endif()