pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Migrate a few more packages to cmake/build.mk.
Module Name: pkgsrc-wip
Committed By: Paul Ripke <stix%stix.id.au@localhost>
Pushed By: stix
Date: Sat Sep 21 16:18:54 2024 +1000
Changeset: b2e978c91a5906ef34d7bcfef65dbf2cac1c73e9
Modified Files:
cereal/Makefile
cgal/Makefile
nlopt/Makefile
occt/Makefile
Log Message:
Migrate a few more packages to cmake/build.mk.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2e978c91a5906ef34d7bcfef65dbf2cac1c73e9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cereal/Makefile | 4 ++--
cgal/Makefile | 6 +++---
nlopt/Makefile | 4 ++--
occt/Makefile | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diffs:
diff --git a/cereal/Makefile b/cereal/Makefile
index c70683ad0b..34e67e29ff 100644
--- a/cereal/Makefile
+++ b/cereal/Makefile
@@ -12,10 +12,10 @@ COMMENT= C++11 library for serialization
LICENSE= modified-bsd
USE_LANGUAGES= c c++
-USE_TOOLS+= cmake
-USE_CMAKE= yes
+
# Requires stubs-32.h on CentOS, not provided by pkgsrc
CMAKE_CONFIGURE_ARGS+= -DSKIP_PORTABILITY_TEST=ON
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cgal/Makefile b/cgal/Makefile
index 12c5bb0739..689a63b789 100644
--- a/cgal/Makefile
+++ b/cgal/Makefile
@@ -12,17 +12,17 @@ HOMEPAGE= https://www.cgal.org/
COMMENT= Computational Geometry Algorithms Library
LICENSE= gnu-lgpl-v3
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++14
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-CMAKE_CONFIGURE_ARGS+= -DCGAL_INSTALL_MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+= -DCGAL_INSTALL_MAN_DIR=${PREFIX}/${PKGMANDIR}/man1
REPLACE_SH+= scripts/cgal_create_CMakeLists
REPLACE_SH+= scripts/cgal_create_cmake_script
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../math/mpfr/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/nlopt/Makefile b/nlopt/Makefile
index 05cf458198..f0df12c7e5 100644
--- a/nlopt/Makefile
+++ b/nlopt/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE= https://nlopt.readthedocs.io/en/latest/
COMMENT= Nonlinear optimization library
LICENSE= gnu-lgpl-v2.1 OR mit
-USE_TOOLS+= cmake pkg-config:run
-USE_CMAKE= yes
+USE_TOOLS+= pkg-config:run
USE_LANGUAGES+= c c++
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/occt/Makefile b/occt/Makefile
index f29111f6f0..680b4e1630 100644
--- a/occt/Makefile
+++ b/occt/Makefile
@@ -12,7 +12,6 @@ COMMENT= Boundary Representation modeling toolkit and 3D geometry library
LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= c c++
-USE_CMAKE= yes
USE_TOOLS+= bash:run
WRKSRC= ${WRKDIR}/occt-V${PKGVERSION_NOREV:S/./_/g}
@@ -58,6 +57,7 @@ OCCT_CUSTOM_COMPILER_DRIVER= custom_gcc_32.sh
PLIST_SUBST= OCCT_CUSTOM_COMPILER_DRIVER=${OCCT_CUSTOM_COMPILER_DRIVER:Q}
+.include "../../devel/cmake/build.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../math/eigen3/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index