Skip to content

Commit 791b310

Browse files
committed
Prepare for packaging, fix CMake
1 parent b8aa9b3 commit 791b310

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

.github/workflows/mainline-compile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
sudo -u ci conan install . --build=missing
4646
sudo -u ci cmake --preset conan-release
4747
sudo -u ci cmake --build build/Release -j$(nproc)
48+
sudo -u ci cmake --build build/Release package
4849
4950
- name: Upload package tarball
5051
uses: actions/upload-artifact@v4
5152
with:
5253
name: hcpu-tarballs-${{ matrix.compiler }}
5354
path: |
54-
bazel-bin/tools/packaging/*.tar.gz
55-
!bazel-bin/tools/packaging/hcpu.tar.gz
55+
build/Release/*.tar.gz
5656
if-no-files-found: error

.github/workflows/mainline-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
artifact_name:
77
type: string
8-
default: "hcpu-tarballs*"
8+
default: "hypercpu-*"
99

1010
jobs:
1111
install-and-test:

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ cmake_minimum_required(VERSION 3.28)
22
project(HyperCPU VERSION 0.5.0 LANGUAGES CXX)
33

44
include(CheckIPOSupported)
5+
include(CPack)
56

67
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
78
set(EXPORT_COMPILE_COMMANDS TRUE)
89
set(CMAKE_CXX_STANDARD 20)
910
set(CMAKE_CXX_STANDARD_REQUIRED ON)
11+
set(CPACK_GENERATOR "TGZ")
12+
set(CPACK_PACKAGE_FILE_NAME "hypercpu-${CMAKE_BUILD_TYPE}")
1013

1114
find_package(GTest REQUIRED)
1215
find_package(argparse REQUIRED)

src/Assembler/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ target_link_libraries(hcasm-core PUBLIC
1010
eternal::eternal
1111
spdlog::spdlog
1212
re2::re2
13+
argparse::argparse
1314
hcpu-common
1415
)
1516

0 commit comments

Comments
 (0)