ci: fix CMake and add a simple build test

We continue to support only meson. However, there seem to be enough unfortunate users who are dependent on CMake. To avoid simple regressions like forgetting cpp files for them in the future, we are now adding a simple build test for CMake to the CI pipeline. ATTENTION: If there are serious obstacles to using CMake in the future we will revert this. Signed-off-by: Patrick Bruenn <[email protected]>
Beckhoff · Dec 13, 2024 · ca7602b · ca7602b
1 parent 6efd256
commit ca7602b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -65,6 +65,21 @@ build-alpine:
   before_script:
     - apk add g++ meson
 
+build-cmake:
+  stage: build
+  tags:
+    - docker
+  before_script:
+    - apt-get update && apt-get --assume-yes install cmake
+  script:
+    - cmake -S . -B build
+    - cmake --build build
+  artifacts:
+    when: always
+    paths:
+    - AdsLib/**/*.h
+    - build/
+
 build-linux-clang:
   extends: .build-meson-docker
   variables:

diff --git a/AdsLib/CMakeLists.txt b/AdsLib/CMakeLists.txt
@@ -7,11 +7,11 @@ set(SOURCES
   Frame.cpp
   LicenseAccess.cpp
   Log.cpp
-  RouterAccess.cpp
+  MasterDcStatAccess.cpp
   RTimeAccess.cpp
-  Sockets.cpp
-
   RegistryAccess.cpp
+  RouterAccess.cpp
+  Sockets.cpp
   SymbolAccess.cpp
 
   bhf/ParameterList.cpp