Skip to content

Commit

Permalink
fix cmake warnings and mac ci install
Browse files Browse the repository at this point in the history
  • Loading branch information
d99kris committed Jun 1, 2024
1 parent b54b0d3 commit 0dbe9d9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.14...3.22 FATAL_ERROR)
project(heapusage VERSION 1.0 LANGUAGES C CXX)

set(COMMON_FLAGS "-funwind-tables -g -Wall -Wextra -Wpedantic -Wshadow \
Expand Down
2 changes: 1 addition & 1 deletion ext/backward-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.14...3.22 FATAL_ERROR)
project(backward CXX)

# Introduce variables:
Expand Down
8 changes: 6 additions & 2 deletions make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# make.sh
#
# Copyright (C) 2020 Kristofer Berggren
# Copyright (C) 2020-2024 Kristofer Berggren
# All rights reserved.
#
# See LICENSE for redistribution information.
Expand Down Expand Up @@ -116,7 +116,11 @@ if [[ "${INSTALL}" == "1" ]]; then
if [ "${OS}" == "Linux" ]; then
cd build && sudo make install && cd .. || exiterr "install failed (linux), exiting."
elif [ "${OS}" == "Darwin" ]; then
cd build && make install && cd .. || exiterr "install failed (mac), exiting."
GHSUDO=""
if [[ "${GITHUB_ACTIONS}" == "true" ]]; then
GHSUDO="sudo"
fi
cd build && ${GHSUDO} make install && cd .. || exiterr "install failed (mac), exiting."
else
exiterr "install failed (unsupported os ${OS}), exiting."
fi
Expand Down
6 changes: 3 additions & 3 deletions src/heapusage
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# Copyright (C) 2017-2023 Kristofer Berggren
# Copyright (C) 2017-2024 Kristofer Berggren
# All rights reserved.
#
# heapusage is distributed under the BSD 3-Clause license, see LICENSE for details.
Expand Down Expand Up @@ -46,9 +46,9 @@ showusage()

showversion()
{
echo "heapusage v2.07"
echo "heapusage v2.08"
echo ""
echo "Copyright (C) 2017-2023 Kristofer Berggren"
echo "Copyright (C) 2017-2024 Kristofer Berggren"
echo ""
echo "heapusage is distributed under the BSD 3-Clause license."
echo ""
Expand Down
4 changes: 2 additions & 2 deletions src/heapusage.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
.TH HEAPUSAGE "1" "June 2023" "heapusage v2.07" "User Commands"
.TH HEAPUSAGE "1" "June 2024" "heapusage v2.08" "User Commands"
.SH NAME
heapusage \- find memory leaks in applications
.SH SYNOPSIS
Expand Down Expand Up @@ -72,6 +72,6 @@ Written by Kristofer Berggren
.SH "REPORTING BUGS"
Report bugs at https://github.com/d99kris/heapusage
.SH COPYRIGHT
Copyright \(co 2017\-2023 Kristofer Berggren
Copyright \(co 2017\-2024 Kristofer Berggren
.PP
heapusage is distributed under the BSD 3\-Clause license.

0 comments on commit 0dbe9d9

Please sign in to comment.