Switch to CMake and harden TRANSFER size validation

Author: gistrec

.github/workflows/release.yml

@@ -35,30 +35,38 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          install: mingw-w64-x86_64-gcc make
+          install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
 
-      - name: Build (release)
+      - name: Configure
         env:
           VERSION: ${{ github.ref_name }}
         run: |
           if [ "$RUNNER_OS" == "Windows" ]; then
-            make program \
-              CXXFLAGS="-std=c++17 -O2 -Wall -Wextra -pthread -DFILEBROADCASTER_VERSION=\\\"${VERSION}\\\"" \
-              LDLIBS_WIN="-lws2_32 -static -static-libgcc -static-libstdc++"
-            mv FileBroadcaster FileBroadcaster.exe
+            cmake -S . -B build -G Ninja \
+                  -DCMAKE_BUILD_TYPE=Release \
+                  -DBUILD_TESTING=OFF \
+                  -DFILEBROADCASTER_VERSION="${VERSION}" \
+                  -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++"
           else
-            make program \
-              CXXFLAGS="-std=c++17 -O2 -Wall -Wextra -pthread -DFILEBROADCASTER_VERSION=\"\\\"${VERSION}\\\"\""
+            cmake -S . -B build \
+                  -DCMAKE_BUILD_TYPE=Release \
+                  -DBUILD_TESTING=OFF \
+                  -DFILEBROADCASTER_VERSION="${VERSION}"
           fi
 
-      - name: Rename artifact
-        run: mv ${{ matrix.artifact_name }} ${{ matrix.asset_name }}
+      - name: Build
+        run: cmake --build build --config Release
+
+      - name: Stage artifact
+        run: |
+          mkdir -p out
+          cp build/${{ matrix.artifact_name }} out/${{ matrix.asset_name }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.asset_name }}
-          path: ${{ matrix.asset_name }}
+          path: out/${{ matrix.asset_name }}
           if-no-files-found: error
 
   release:

.github/workflows/tests.yml

@@ -28,41 +28,37 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
-          install: mingw-w64-x86_64-gcc make mingw-w64-x86_64-gtest
+          install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gtest
 
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtest-dev
+          sudo apt-get install -y libgtest-dev cmake
 
       - name: Install dependencies (macOS)
         if: runner.os == 'macOS'
         run: brew install googletest
 
-      - name: Build program
+      - name: Configure
         run: |
           if [ "$RUNNER_OS" == "Windows" ]; then
-            make program LDLIBS_WIN="-lws2_32"
+            cmake -S . -B build -G Ninja
           else
-            make program
+            cmake -S . -B build
           fi
 
-      - name: Build tests
+      - name: Build
+        run: cmake --build build --config Release
+
+      - name: Run tests
+        # Skip e2e on Windows: SO_REUSEADDR semantics on Winsock cause one
+        # socket to silently capture all loopback traffic, which breaks
+        # two-process localhost tests. The protocol works fine across
+        # separate hosts.
         run: |
-          if [ "$RUNNER_OS" == "macOS" ]; then
-            GTEST_PREFIX=$(brew --prefix googletest)
-            make gtests GTEST_CFLAGS="-I${GTEST_PREFIX}/include" GTEST_LDFLAGS="-L${GTEST_PREFIX}/lib"
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            ctest --test-dir build --output-on-failure -E e2e
           else
-            make gtests
+            ctest --test-dir build --output-on-failure
           fi
-
-      - name: Run tests
-        run: ./GTests --gtest_filter=*
-
-      - name: Run E2E loopback tests
-        # Skip on Windows: SO_REUSEADDR semantics on Winsock cause one socket
-        # to silently capture all loopback traffic, which breaks two-process
-        # localhost tests. The protocol works fine across separate hosts.
-        if: runner.os != 'Windows'
-        run: make e2e

CMakeLists.txt

@@ -0,0 +1,76 @@
+cmake_minimum_required(VERSION 3.15)
+project(FileBroadcaster CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
+endif()
+
+# Version string baked into the binary; the release workflow overrides this
+# from the git tag (e.g. -DFILEBROADCASTER_VERSION=v1.0.0).
+set(FILEBROADCASTER_VERSION "1.0.0" CACHE STRING "Version string for --version output")
+
+# --- main executable ---------------------------------------------------------
+
+add_executable(FileBroadcaster
+    src/Main.cpp
+    src/Sender.cpp
+    src/Receiver.cpp
+    src/Config.cpp
+)
+
+target_include_directories(FileBroadcaster PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/cxxopts/include
+)
+
+target_compile_definitions(FileBroadcaster PRIVATE
+    FILEBROADCASTER_VERSION="${FILEBROADCASTER_VERSION}"
+)
+
+if(MSVC)
+    target_compile_options(FileBroadcaster PRIVATE /W4 /permissive-)
+else()
+    target_compile_options(FileBroadcaster PRIVATE -Wall -Wextra)
+endif()
+
+if(WIN32)
+    target_link_libraries(FileBroadcaster PRIVATE ws2_32)
+else()
+    find_package(Threads REQUIRED)
+    target_link_libraries(FileBroadcaster PRIVATE Threads::Threads)
+endif()
+
+# --- tests -------------------------------------------------------------------
+
+option(BUILD_TESTING "Build the unit-test target" ON)
+
+if(BUILD_TESTING)
+    enable_testing()
+    find_package(GTest QUIET)
+    if(GTest_FOUND)
+        add_executable(GTests tests/Tests.cpp)
+        target_link_libraries(GTests PRIVATE GTest::gtest)
+        if(NOT WIN32)
+            find_package(Threads REQUIRED)
+            target_link_libraries(GTests PRIVATE Threads::Threads)
+        endif()
+        add_test(NAME unit COMMAND GTests)
+    else()
+        message(STATUS "GTest not found — skipping GTests target")
+    endif()
+
+    # E2E loopback test (Linux/macOS only — Winsock SO_REUSEADDR semantics
+    # break two-process loopback, see tests/e2e.sh comment).
+    if(NOT WIN32)
+        add_test(
+            NAME e2e
+            COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/tests/e2e.sh
+        )
+        set_tests_properties(e2e PROPERTIES
+            ENVIRONMENT "BINARY=$<TARGET_FILE:FileBroadcaster>"
+        )
+    endif()
+endif()

FileBroadcaster.sln

@@ -150,39 +150,37 @@ development):
 
 ### Requirements
 
-- **Linux / macOS:** GCC 7+ or Clang 5+ with C++17 support, GNU Make, pthreads.
-- **Windows (MinGW64):** [MSYS2](https://www.msys2.org/) with
-  `mingw-w64-x86_64-gcc` and `make`.
-- **Windows (Visual Studio):** Visual Studio 2017 or later with the v141
-  platform toolset.
+- CMake 3.15+
+- A C++17 compiler:
+  - GCC 7+ or Clang 5+ on Linux/macOS,
+  - MinGW64 GCC via [MSYS2](https://www.msys2.org/) on Windows,
+  - or MSVC 2019+ through the Visual Studio CMake generator.
+- pthreads (Linux/macOS).
 
-### Linux / macOS / MSYS2
+### Build
 
 ```sh
 git clone https://github.com/gistrec/File-Broadcaster.git
 cd File-Broadcaster
 git submodule update --init --recursive
-make program
+cmake -S . -B build
+cmake --build build --config Release
 ```
 
-The binary is written to `./FileBroadcaster`.
-
-### Windows (Visual Studio)
-
-1. Clone the repository.
-2. Run `git submodule update --init --recursive`.
-3. Open `FileBroadcaster.sln` in Visual Studio.
-4. Build the solution.
+The binary lands at `build/FileBroadcaster` (or
+`build\Release\FileBroadcaster.exe` with the multi-config Visual Studio
+generator).
 
 ### Tests
 
 ```sh
-make gtests   # unit tests (requires Google Test)
-./GTests
-
-make e2e      # loopback end-to-end test (small + large file)
+ctest --test-dir build --output-on-failure
 ```
 
+Runs the unit tests (requires Google Test installed) and the loopback
+end-to-end test. Pass `-E e2e` to skip the e2e case on Windows, where
+Winsock semantics break two-process loopback.
+
 ## License
 
 [MIT](LICENSE).