Skip to content

pcons: find libmx2 through pkg-config and add_subdirectory() #2

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

Open
garyo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pcons: find libmx2 through pkg-config and add_subdirectory() #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ACMX2/interface/pcons-build.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# /// script
# requires-python = ">=3.11"
# dependencies = ["pcons"]
# dependencies = ["pcons>=0.24"]
# ///
"""pcons build for the ACMX2 Qt 6 interface (acmx2_interface).

Expand Down
43 changes: 25 additions & 18 deletions pcons-build.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# /// script
# requires-python = ">=3.11"
# dependencies = ["pcons"]
# dependencies = ["pcons>=0.24"]
# ///
"""pcons build for acidcam-gpu / ACMX2 (https://github.com/lostjared/acidcam-gpu).

Expand All @@ -27,10 +27,12 @@
VARIANT=debug (-DCMAKE_BUILD_TYPE) default: release
PREFIX=<dir> (-DCMAKE_PREFIX_PATH) extra dependency search prefix

Everything is found through pkg-config except libmx2
(https://github.com/lostjared/libmx2) and glm, which install CMake config
files but no .pc; those two are located by prefix. Point PREFIX at them when
they are installed somewhere other than /usr/local or the Homebrew prefix.
Everything is found through pkg-config. libmx2
(https://github.com/lostjared/libmx2) only provides a .pc file when it is
built with pcons; a CMake-built libmx2 installs neither .pc files nor a
findable glm, so both are located by prefix instead. Point PREFIX at them
when they are installed somewhere other than /usr/local or the Homebrew
prefix.

Usage:
uvx pcons # configure, generate and build
Expand All @@ -45,13 +47,12 @@
ImportedTarget,
PackageDescription,
Project,
Target,
find_c_toolchain,
find_cuda_toolchain,
get_platform,
get_var,
)
from pcons.core.node import Node
from pcons.core.target import Target
from pcons.packages.finders import PkgConfigFinder

project_dir = Path(__file__).parent
Expand Down Expand Up @@ -207,16 +208,22 @@ def find_cuda_runtime() -> ImportedTarget:
)


# libmx2 headers include glm unqualified, so glm is a public dependency of it.
glm = find_by_prefix("glm", "glm/glm.hpp", hint="Install glm (a header-only library). ")
libmx2 = find_by_prefix(
"libmx2",
"mx2/mx.hpp",
include_subdir="mx2",
libraries=("mx", "mxgl"),
hint="Build it from https://github.com/lostjared/libmx2. ",
)
libmx2.link(glm)
# libmx2 built with pcons installs pkg-config files, and they already carry
# glm's include directory. A CMake-built libmx2 installs neither, so fall back
# to searching the prefix and add glm by hand.
libmx2 = project.find_package("libmxgl", required=False)
if libmx2 is None:
glm = find_by_prefix(
"glm", "glm/glm.hpp", hint="Install glm (a header-only library). "
)
libmx2 = find_by_prefix(
"libmx2",
"mx2/mx.hpp",
include_subdir="mx2",
libraries=("mx", "mxgl"),
hint="Build it from https://github.com/lostjared/libmx2. ",
)
libmx2.link(glm)

# OpenGL: a framework on macOS, a plain library elsewhere.
if platform.is_macos:
Expand Down Expand Up @@ -270,7 +277,7 @@ def find_cuda_runtime() -> ImportedTarget:
# ACMX2: the engine
# =============================================================================

sources: list[str | Path | Node] = ["ACMX2/acmx.cpp", "ACMX2/program.cpp"]
sources: list[str | Path] = ["ACMX2/acmx.cpp", "ACMX2/program.cpp"]
defines = ["WITH_GL"]
libs: list[Target] = [libmx2, opencv, sdl2, sdl2_ttf, mxwrite, ffmpeg]

Expand Down