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

[CI]: build wxWidget in C++17 with no longer hardcoded parallel jobs. #3339

Merged
merged 1 commit into from
Apr 6, 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
9 changes: 5 additions & 4 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
run: |
mkdir wxWidgets/build-release
cd wxWidgets/build-release
../configure --enable-shared --enable-monolithic --with-osx_cocoa CXX='clang++ -std=c++11 -stdlib=libc++ -I../src/tiff/libtiff' CC=clang --disable-debug --disable-mediactrl --enable-stl
make -j10
../configure --enable-shared --enable-monolithic --with-osx_cocoa CXX='clang++ -std=c++17 -stdlib=libc++ -I../src/tiff/libtiff' CC=clang --disable-debug --disable-mediactrl --enable-stl
make -j$(sysctl -n hw.physicalcpu)
sudo make install

# Codelite
Expand All @@ -46,5 +46,6 @@ jobs:
cmake --build . -j $(sysctl -n hw.physicalcpu)
cmake --build . --target install

- name: codelite --version
run: codelite.app/Contents/MacOS/codelite --version || exit 0 # codelite --version returns -1
# Not the right command/path for codelite
# - name: codelite --version
# run: codelite.app/Contents/MacOS/codelite --version || exit 0 # codelite --version returns -1
4 changes: 2 additions & 2 deletions docs/docs/build/build_wx_widgets.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ git submodule init
git submodule update
mkdir build-release
cd build-release
../configure --enable-shared --enable-monolithic --with-osx_cocoa CXX='clang++ -std=c++11 -stdlib=libc++ -I../src/tiff/libtiff' CC=clang --disable-debug --disable-mediactrl --enable-stl
make -j10
../configure --enable-shared --enable-monolithic --with-osx_cocoa CXX='clang++ -std=c++17 -stdlib=libc++ -I../src/tiff/libtiff' CC=clang --disable-debug --disable-mediactrl --enable-stl
make -j$(sysctl -n hw.physicalcpu)
sudo make install
```

Expand Down