Skip to content

Commit

Permalink
Fix cmake compilation (#954)
Browse files Browse the repository at this point in the history
* BUILD: cmake - remove entire if block for installation action

* BUILD: appimage - change path to ezquake executable

* DOC: update BUILD.md to reflect changes

* PIPELINE: use bash instead of msys2
  • Loading branch information
ciscon authored Oct 21, 2024
1 parent 6b75554 commit 1ceecb5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-deploy-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ jobs:
- name: Setup SSH
env:
SSH_AUTH_SOCK: C:\ssh_agent.sock
shell: msys2 {0}
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
shell: bash
run: |
ssh-agent -a $SSH_AUTH_SOCK > /dev/null
ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
- name: Set date
shell: msys2 {0}
shell: bash
run: |
export TZ=CET-1CEST
echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV
- name: Deploy
env:
SSH_AUTH_SOCK: C:\ssh_agent.sock
shell: msys2 {0}
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
shell: bash
run: |
mkdir -p upload/snapshots/windows/${{ matrix.platform }}/${{ matrix.config }}
mkdir -p upload/snapshots/latest/windows/${{ matrix.platform }}/${{ matrix.config }}
Expand Down
3 changes: 1 addition & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ dependency is not installed. Check the output to see if it matches your expectat
in regard to optional dependencies.

When configure phase passes, the build phase will produce a dynamically linked binary.
For convenience this binary is copied to the top project directory, but can otherwise
be found in the build directory at `build/ezquake-linux-x86_64`.
The resulting binary can be found in the build directory at `build/ezquake-linux-x86_64`.

The default mode of compilation is to not show the full command line, only errors and
warnings. To enable verbose mode, set `CMAKE_VERBOSE_MAKEFILE` to `ON`.
Expand Down
8 changes: 0 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -891,14 +891,6 @@ endif()

set_target_properties(ezquake PROPERTIES OUTPUT_NAME ${EXECUTABLE_NAME})

# Make executable easy to find in project root, strip if release (macOS does this on its own).
# If CMake was invoked with an installation prefix, don't override with project root.
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(INSTALL_DESTINATION "${PROJECT_SOURCE_DIR}" CACHE PATH "Installation Directory" FORCE)

install(TARGETS ezquake DESTINATION ${INSTALL_DESTINATION})
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
get_target_property(version git_version GIT_DESCRIBE)

Expand Down
2 changes: 1 addition & 1 deletion misc/appimage/appimage-manual_creation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ echo "$TESTPROGRAM" > "$DIR/test.c" || exit 2
gcc "$DIR/test.c" -o "$DIR/AppDir/usr/bin/test" -lcurl || exit 2
rm -f "$DIR/AppDir/test.c" || exit 2

cp -f ezquake-linux-$ARCH "$DIR/AppDir/usr/bin/." || exit 4
cp -f build-dynamic/Release/ezquake-linux-$ARCH "$DIR/AppDir/usr/bin/." || exit 4
rm -f "$DIR/AppDir/AppRun"
echo "$QUAKE_SCRIPT" > "$DIR/AppDir/AppRun" || exit 4
chmod +x "$DIR/AppDir/AppRun" || exit 4
Expand Down

0 comments on commit 1ceecb5

Please sign in to comment.