Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove doctest related options #12

Merged
merged 2 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ jobs:
- name: Install LibGS
run: sudo apt-get -y install libgs9 libgs9-common

- name: Install GCC 12
run: sudo apt-get -y install gcc-12

- name: Install xmake
run: |
sudo add-apt-repository ppa:xmake-io/xmake
Expand All @@ -37,12 +34,9 @@ jobs:
pip install sphinx breathe exhale myst-parser docutils pydata-sphinx-theme sphinx-sitemap

- name: Configure Linux
env:
CC: gcc-12
CXX: gcc-12
working-directory: ${{github.workspace}}
run: |
xmake f -c -y --toolchain=envs
xmake f -c -y --toolchain=gcc-13
xmake project -k compile_commands

- name: Build Linux
Expand Down
34 changes: 6 additions & 28 deletions .github/workflows/xmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,11 @@ jobs:
sudo apt-get -y install xmake

- name: Configure
env:
CC: gcc-13
CXX: gcc-13
working-directory: ${{github.workspace}}
run: xmake f -c -y --toolchain=envs
run: xmake f -c -y --toolchain=gcc-13

- name: Build
env:
CC: gcc-13
CXX: gcc-13
ACTIONS_STEP_DEBUG: true
working-directory: ${{github.workspace}}
run: xmake b
Expand All @@ -47,16 +42,12 @@ jobs:

- name: Install Package
env:
CC: gcc-13
CXX: gcc-13
ACTIONS_STEP_DEBUG: true
run: |
xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git"
xrepo update-repo -y
xrepo install -y --toolchain=envs "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=envs --configs="hyperion_enable_tracy=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=envs --configs="hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=envs --configs="hyperion_enable_tracy=true,hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=gcc-13 "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=gcc-13 --configs="hyperion_enable_tracy=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"

build-linux-clang-16-x64:
runs-on: ubuntu-latest
Expand All @@ -83,18 +74,13 @@ jobs:
run: sudo cp /usr/bin/clang-tidy-16 /usr/bin/clang-tidy -f

- name: Configure
env:
CC: clang-16
CXX: clang-16
working-directory: ${{github.workspace}}
run: |
rm -rf build .xmake
xmake f -c -y --toolchain=envs
xmake f -c -y --toolchain=clang-16

- name: Build
env:
CC: clang-16
CXX: clang-16
ACTIONS_STEP_DEBUG: true
working-directory: ${{github.workspace}}
run: |
Expand All @@ -114,16 +100,12 @@ jobs:

- name: Install Package
env:
CC: clang-16
CXX: clang-16
ACTIONS_STEP_DEBUG: true
run: |
xrepo add-repo -y hyperion "https://github.com/braxtons12/hyperion_packages.git"
xrepo update-repo -y
xrepo install -y --toolchain=envs "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=envs --configs="hyperion_enable_tracy=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=envs --configs="hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=envs --configs="hyperion_enable_tracy=true,hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=clang-16 "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=clang-16 --configs="hyperion_enable_tracy=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"

build-windows-msvc-x64:
runs-on: windows-latest
Expand Down Expand Up @@ -178,8 +160,6 @@ jobs:
xrepo update-repo -y
xrepo install -y --toolchain=msvc "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=msvc --configs="hyperion_enable_tracy=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=msvc --configs="hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=msvc --configs="hyperion_enable_tracy=true,hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"

build-macos-xcode-x64:
runs-on: macos-latest
Expand Down Expand Up @@ -228,5 +208,3 @@ jobs:
xrepo update-repo -y
xrepo install -y --toolchain=xcode "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=xcode --configs="hyperion_enable_tracy=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=xcode --configs="hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
xrepo install -y --toolchain=xcode --configs="hyperion_enable_tracy=true,hyperion_enable_testing=true" "hyperion_mpl ${{ steps.extract_branch.outputs.branch }}"
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@ project(hyperion_mpl LANGUAGES CXX)
include(CTest)

option(HYPERION_ENABLE_TRACY "Enables Profiling with Tracy" OFF)
option(HYPERION_ENABLE_TESTING "Enables Testing Macros with Doctest" OFF)
option(HYPERION_USE_FETCH_CONTENT "Enables FetchContent usage for getting dependencies" ON)

set(HYPERION_ENABLE_TRACY
${HYPERION_ENABLE_TRACY}
CACHE
INTERNAL
"force dependencies's `HYPERION_ENABLE_TRACY` to the value of this top-level project")
set(HYPERION_ENABLE_TESTING
${HYPERION_ENABLE_TESTING}
CACHE
INTERNAL
"force dependencies's `HYPERION_ENABLE_TESTING` to the value of this top-level project")
set(HYPERION_USE_FETCH_CONTENT
${HYPERION_USE_FETCH_CONTENT}
CACHE
Expand All @@ -30,7 +24,7 @@ endif()
if(${HYPERION_USE_FETCH_CONTENT})
FetchContent_Declare(hyperion_platform
GIT_REPOSITORY "https://github.com/braxtons12/hyperion_platform"
GIT_TAG "v0.2.2"
GIT_TAG "v0.3.1"
)
FetchContent_MakeAvailable(hyperion_platform)
else()
Expand Down
2 changes: 1 addition & 1 deletion docs/quick_start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ other methods like :cmake:`add_subdirectory`\. Example for :cmake:`FetchContent`
# Declare the dependency on hyperion-utils and make it available for use
FetchContent_Declare(hyperion_mpl
GIT_REPOSITORY "https://github.com/braxtons12/hyperion_mpl"
GIT_TAG "v0.7.1")
GIT_TAG "v0.8.0")
FetchContent_MakeAvailable(hyperion_mpl)

# For this example, we create an executable target and link hyperion::mpl to it
Expand Down
8 changes: 1 addition & 7 deletions xmake.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---@diagnostic disable: undefined-global,undefined-field
set_project("hyperion_mpl")
set_version("0.7.2")
set_version("0.8.0")

set_xmakever("2.8.7")

Expand All @@ -14,17 +14,12 @@ option("hyperion_enable_tracy", function()
set_default(false)
end)

option("hyperion_enable_testing", function()
set_default(false)
end)

add_requires("hyperion_platform", {
system = false,
external = true,
configs = {
languages = "cxx20",
hyperion_enable_tracy = has_config("hyperion_enable_tracy"),
hyperion_enable_testing = has_config("hyperion_enable_testing"),
}
})

Expand Down Expand Up @@ -66,7 +61,6 @@ target("hyperion_mpl", function()
settings.set_compiler_settings(target)
end)
add_options("hyperion_enable_tracy", {public = true})
add_options("hyperion_enable_testing", {public = true})

add_packages("hyperion_platform", { public = true })
end)
Expand Down
Loading