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.

Sign up for GitHub

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

Jump to bottom

fltk [email protected]: declare indirect deps with linkage, use std_*_args #198521

Merged
merged 2 commits into from
Nov 21, 2024
+23 −21
Merged

fltk [email protected]: declare indirect deps with linkage, use std_*_args #198521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b2e55
fltk: declare indirect deps with linkage, use `std_*_args`
ZhongRuoyu Nov 21, 2024
7ba55c0
[email protected]: use `std_configure_args`
ZhongRuoyu Nov 21, 2024
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
36 changes: 18 additions & 18 deletions Formula/f/fltk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class Fltk < Formula

depends_on "jpeg-turbo"
depends_on "libpng"
uses_from_macos "zlib"

on_linux do
depends_on "pkgconf" => :build
Expand All @@ -42,25 +43,24 @@ class Fltk < Formula

def install
if build.head?
args = std_cmake_args

# Don't build docs / require doxygen
args << "-DOPTION_BUILD_HTML_DOCUMENTATION=OFF"
args << "-DOPTION_BUILD_PDF_DOCUMENTATION=OFF"

# Don't build tests
args << "-DFLTK_BUILD_TEST=OFF"

# Build both shared & static libs
args << "-DOPTION_BUILD_SHARED_LIBS=ON"

system "cmake", ".", *args
system "cmake", "--build", "."
system "cmake", "--install", "."
args = [
# Don't build docs / require doxygen
"-DOPTION_BUILD_HTML_DOCUMENTATION=OFF",
"-DOPTION_BUILD_PDF_DOCUMENTATION=OFF",
# Don't build tests
"-DFLTK_BUILD_TEST=OFF",
# Build both shared & static libs
"-DOPTION_BUILD_SHARED_LIBS=ON",
]
system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
system "cmake", "--build", "build"
system "cmake", "--install", "build"
else
system "./configure", "--prefix=#{prefix}",
"--enable-threads",
"--enable-shared"
args = %w[
--enable-threads
--enable-shared
]
system "./configure", *args, *std_configure_args
system "make", "install"
end
end
Expand Down
8 changes: 5 additions & 3 deletions Formula/f/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class FltkAT13 < Formula

Check notice on line 1 in Formula/f/[email protected]

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Bottle cache hit 

Bottle for [email protected] built at f41454651d4 (Merge 53912ca873c835d903743933a0776235d30ebc45 into 5a0a44d73b697d83801f10d7cead175fd698164c, 2024-11-21)

Check notice on line 1 in Formula/f/[email protected]

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

Bottle cache hit 

Bottle for [email protected] built at f41454651d4 (Merge 53912ca873c835d903743933a0776235d30ebc45 into 5a0a44d73b697d83801f10d7cead175fd698164c, 2024-11-21)

Check notice on line 1 in Formula/f/[email protected]

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Bottle cache hit 

Bottle for [email protected] built at f41454651d4 (Merge 53912ca873c835d903743933a0776235d30ebc45 into 5a0a44d73b697d83801f10d7cead175fd698164c, 2024-11-21)

Check notice on line 1 in Formula/f/[email protected]

View workflow job for this annotation

GitHub Actions / Linux

Bottle cache hit 

Bottle for [email protected] built at f41454651d4 (Merge 53912ca873c835d903743933a0776235d30ebc45 into 5a0a44d73b697d83801f10d7cead175fd698164c, 2024-11-21)
desc "Cross-platform C++ GUI toolkit"
homepage "https://www.fltk.org/"
url "https://www.fltk.org/pub/fltk/1.3.10/fltk-1.3.10-source.tar.gz"
Expand Down Expand Up @@ -38,9 +38,11 @@
end

def install
system "./configure", "--prefix=#{prefix}",
"--enable-threads",
"--enable-shared"
args = %w[
--enable-threads
--enable-shared
]
system "./configure", *args, *std_configure_args
system "make", "install"
end

Expand Down
Loading