Skip to content

Commit

Permalink
change default linux build to cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangjipeng committed Jul 4, 2024
1 parent 95ee6bd commit 5a0f80d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 28 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/linux-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: auto gen
run: ./autogen.sh
- name: configure
run: ./configure
- name: Generate Project
run: ./build_linux.sh
- name: make
run: make
- name: make check
run: make check
run: make -C ./proj
8 changes: 0 additions & 8 deletions .github/workflows/windows-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ jobs:
- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.0.2

- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Install Python3 Distutils
run: |
python -m pip install --upgrade pip setuptools wheel packaging
- name: Generate Project
run: ./build_windows.bat

Expand Down
10 changes: 2 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,8 @@ Picasso is a high quality vector graphic rendering library. It has high performa

#### linux:
```
1. automake & autoconf
./autogen.sh
./configure
make
sudo make install;
2. gyp build
1. Install cmake above v3.16 on your system
2. Build project
./build_linux.sh
cd proj
make
Expand Down
8 changes: 6 additions & 2 deletions build_linux.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/sh

./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=proj
echo "Please change dir to \"proj\" and type \"make\" or \"make BUILDTYPE=Release\""
mkdir proj
cd proj
# cmake -DCMAKE_BUILD_TYPE=Release ..
cmake -DCMAKE_BUILD_TYPE=Debug ..

echo "Please change dir to \"proj\" and type \"make\""
echo "...\n"
3 changes: 0 additions & 3 deletions build_windows.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
rem set GYP_MSVS_VERSION=2019
rem ./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=vcproj

mkdir proj
cd proj
cmake ../

0 comments on commit 5a0f80d

Please sign in to comment.