Merge pull request #826 from Arpafaucon/merge-import-utilities

Suggestion: Merge import-xxx folders

.github/workflows/build.yml

@@ -43,14 +43,10 @@ jobs:
       run: |
         cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release
         cmake --build csvexport/build --parallel --config Release
-    - name: Import-chrome utility
+    - name: Import utilities
       run: |
-        cmake -B import-chrome/build -S import-chrome -DCMAKE_BUILD_TYPE=Release
+        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release
-        cmake --build import-chrome/build --parallel --config Release
+        cmake --build import/build --parallel --config Release
-    - name: Import-fuchsia utility
-      run: |
-        cmake -B import-fuchsia/build -S import-fuchsia -DCMAKE_BUILD_TYPE=Release
-        cmake --build import-fuchsia/build --parallel --config Release
     - if: ${{ !startsWith(matrix.os, 'windows') }}
       name: Library
       run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build
@@ -63,8 +59,8 @@ jobs:
         cp update/build/tracy-update bin
         cp capture/build/tracy-capture bin
         cp csvexport/build/tracy-csvexport bin
-        cp import-chrome/build/tracy-import-chrome bin
+        cp import/build/tracy-import-chrome bin
-        cp import-fuchsia/build/tracy-import-fuchsia bin
+        cp import/build/tracy-import-fuchsia bin
     - if: startsWith(matrix.os, 'windows')
       name: Find Artifacts
       id: find_artifacts_windows
@@ -74,8 +70,8 @@ jobs:
         copy update\build\Release\tracy-update.exe bin
         copy capture\build\Release\tracy-capture.exe bin
         copy csvexport\build\Release\tracy-csvexport.exe bin
-        copy import-chrome\build\Release\tracy-import-chrome.exe bin
+        copy import\build\Release\tracy-import-chrome.exe bin
-        copy import-fuchsia\build\Release\tracy-import-fuchsia.exe bin
+        copy import\build\Release\tracy-import-fuchsia.exe bin
     - uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.os }}

.github/workflows/linux.yml

@@ -30,14 +30,10 @@ jobs:
       run: |
         cmake -B csvexport/build -S csvexport -DCMAKE_BUILD_TYPE=Release
         cmake --build csvexport/build --parallel
-    - name: Import-chrome utility
+    - name: Import utilities
       run: |
-        cmake -B import-chrome/build -S import-chrome -DCMAKE_BUILD_TYPE=Release
+        cmake -B import/build -S import -DCMAKE_BUILD_TYPE=Release
-        cmake --build import-chrome/build --parallel
+        cmake --build import/build --parallel
-    - name: Import-fuchsia utility
-      run: |
-        cmake -B import-fuchsia/build -S import-fuchsia -DCMAKE_BUILD_TYPE=Release
-        cmake --build import-fuchsia/build --parallel
     - name: Library
       run: meson setup -Dprefix=$GITHUB_WORKSPACE/bin/lib build && meson compile -C build && meson install -C build
     - name: Test application
@@ -70,8 +66,8 @@ jobs:
         cp update/build/tracy-update bin
         cp capture/build/tracy-capture bin
         cp csvexport/build/tracy-csvexport bin
-        cp import-chrome/build/tracy-import-chrome bin
+        cp import/build/tracy-import-chrome bin
-        cp import-fuchsia/build/tracy-import-fuchsia bin
+        cp import/build/tracy-import-fuchsia bin
         strip bin/tracy-*
     - uses: actions/upload-artifact@v4
       with:

.vscode/settings.json

@@ -4,8 +4,7 @@
         "${workspaceFolder}/profiler",
         "${workspaceFolder}/capture",
         "${workspaceFolder}/csvexport",
-        "${workspaceFolder}/import-chrome",
+        "${workspaceFolder}/import",
-        "${workspaceFolder}/import-fuchsia",
         "${workspaceFolder}/update",
         "${workspaceFolder}/test",
         "${workspaceFolder}",

import-chrome/CMakeLists.txt

@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-option(NO_ISA_EXTENSIONS "Disable ISA extensions (don't pass -march=native or -mcpu=native to the compiler)" OFF)
-option(NO_STATISTICS "Disable calculation of statistics" ON)
-option(NO_PARALLEL_STL "Disable parallel STL" OFF)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
-
-set(CMAKE_CXX_STANDARD 20)
-
-project(
-    tracy-import-chrome
-    LANGUAGES C CXX
-    VERSION ${TRACY_VERSION_STRING}
-)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/config.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
-
-set(PROGRAM_FILES
-    src/import-chrome.cpp
-)
-
-add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
-target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer)
-set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})

import/CMakeLists.txt

@@ -9,7 +9,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/version.cmake)
 set(CMAKE_CXX_STANDARD 20)
 
 project(
-    tracy-import-fuchsia
+    tracy-import
     LANGUAGES C CXX
     VERSION ${TRACY_VERSION_STRING}
 )
@@ -18,10 +18,14 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/config.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake)
 
-set(PROGRAM_FILES
+add_executable(tracy-import-chrome
+    src/import-chrome.cpp
+)
+target_link_libraries(tracy-import-chrome PRIVATE TracyServer)
+
+add_executable(tracy-import-fuchsia
     src/import-fuchsia.cpp
 )
+target_link_libraries(tracy-import-fuchsia PRIVATE TracyServer)
 
-add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
-target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer)
 set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})