Skip to content

Commit

Permalink
Merge branch 'unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
nikp123 committed Sep 9, 2021
2 parents afdcb9c + 0970d28 commit dc62314
Show file tree
Hide file tree
Showing 9 changed files with 471 additions and 307 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Build
on:
push:
branches:
- '!release'
- '!master'
- '*'
pull_request:
workflow_dispatch:

Expand Down
10 changes: 10 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/.git)
message(FATAL_ERROR "XAVA from 0.7.0 onwards requires to be built in a .git directory")
endif()

# Correct CMAKE_INSTALL_PREFIX so that distros don't break
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Default installation path" FORCE)
endif()

# Fix pkg-config for cross-builds (such as MinGW on ArchLinux)
if(CMAKE_FIND_ROOT_PATH)
set(CMAKE_SYSROOT "${CMAKE_FIND_ROOT_PATH}")
Expand Down Expand Up @@ -151,6 +156,11 @@ add_executable(
# Link executable
target_link_libraries(xava xava-shared m pthread)

# Generate README file
if(MSYS OR MSVC OR MINGW)
configure_file("assets/windows/readme.txt" "README.txt" NEWLINE_STYLE CRLF)
endif()

# Generate proper license file
file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/final-LICENSE.txt")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Expand Down
Loading

0 comments on commit dc62314

Please sign in to comment.