Skip to content

[pull] master from libsigcplusplus:master #11

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

Merged
merged 10 commits into from
Jul 19, 2025
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: 3 additions & 5 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

name: Publish docs

# 2024-12-12: ubuntu-latest = ubuntu-22.04
# 2025-02-05: ubuntu-latest = ubuntu-24.04
# See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
on:
# Runs on pushes targeting the default branch
Expand Down Expand Up @@ -39,10 +39,7 @@ jobs:
# Prevent blocking apt install on a question during configuring of tzdata.
export ENV DEBIAN_FRONTEND=noninteractive
sudo apt update
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ ninja-build python3-setuptools python3-pip --yes
# Ubuntu 22.04 contains meson 0.61.2, but libsigc++ requires meson >= 0.62.0.
# Install it with pip instead of apt.
sudo pip install "meson>=0.62.0"
sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ meson ninja-build python3-setuptools python3-pip --yes
meson setup -Dbuild-documentation=true -Dbuild-examples=false -Dbuild-tests=false _build
meson compile -C _build
- name: Collect Documentation
Expand All @@ -56,6 +53,7 @@ jobs:
# Move generated documentation.
mv _build/docs/docs/manual/html _publish/manual
mv _build/docs/docs/reference/html _publish/reference
mv _build/docs/docs/reference/*.tag _publish/reference/html
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Build with Jekyll
Expand Down
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# License along with this library; if not, see <https://www.gnu.org/licenses/>.

cmake_minimum_required (VERSION 3.2)
cmake_minimum_required (VERSION 3.10)

set (SIGCXX_MAJOR_VERSION 3)
set (SIGCXX_MINOR_VERSION 4)
Expand Down
Loading