Skip to content

Commit

Permalink
Split CMake Linux builds (#400)
Browse files Browse the repository at this point in the history
Simplifying the most commonly used build system entrypoint by isolating
all the Steam runtime static linking nonsense into its own dark corner
in the cellar.

Also paving the road to tackling Windows and macOS with cmake.

This changes the default command to prep the build, but that is
documented in the readme. Local experimentation most welcome during a
review. You might have to remove the untracked directory `CMakeFiles/`
and the untracked file`CMakeCache.txt` as the location of the main build
definition has changed and then `cmake buildsystem/linux-dynamic` should
generate you a `Makefile` for a debug build.
  • Loading branch information
Rotonen authored Dec 6, 2024
1 parent 6102ad2 commit 4b34a49
Show file tree
Hide file tree
Showing 81 changed files with 3,861 additions and 3,830 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoketest-debian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

- name: Build Prep Anura
run: |
cmake . \
cmake buildsystem/linux-dynamic \
-D CMAKE_CXX_COMPILER="${{ matrix.compiler }}" \
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoketest-fedora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Build Prep Anura
run: |
cmake . \
cmake buildsystem/linux-dynamic \
-D CMAKE_CXX_COMPILER="${{ matrix.compiler }}" \
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoketest-opensuse-leap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:

- name: Build Prep Anura
run: |
cmake . \
cmake buildsystem/linux-dynamic \
-D CMAKE_CXX_COMPILER="${{ matrix.compiler }}" \
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-smoketest-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:

- name: Build Prep Anura
run: |
cmake . \
cmake buildsystem/linux-dynamic \
-D CMAKE_CXX_COMPILER="${{ matrix.compiler }}" \
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-unit-tests-dynamic-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Build Prep Anura
run: |
cmake . \
cmake buildsystem/linux-dynamic \
-D CMAKE_CXX_COMPILER='clang++' \
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pr-unit-tests-static-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ jobs:

- name: Build Prep Anura
run: |
cmake . \
cmake buildsystem/linux-steam \
-D CMAKE_CXX_COMPILER="${{ matrix.compiler }}" \
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}" \
-D CMAKE_LINK_TYPE=Static
-D CMAKE_BUILD_TYPE="${{ matrix.build-type }}"
- name: Build Anura
run: |
Expand Down
335 changes: 0 additions & 335 deletions CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 4b34a49

Please sign in to comment.