gnu: asli: Update to 0.1-1.4f4ba14.

* gnu/packages/graphics.scm (asli): Update to the commit
4f4ba142ea7db6eecfdb546538c88a38680a83c5 to allow build with CGAL v5.6.
* gnu/packages/patches/asli-use-system-libs.patch: Update.

Change-Id: I623099a34d96180fe6aa4c161cfa895597a45304
This commit is contained in:
Artyom V. Poptsov 2024-08-14 08:48:45 +03:00 committed by Ludovic Courtès
parent 7aecfa9462
commit 455da8f458
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 102 additions and 91 deletions

View file

@ -2852,18 +2852,21 @@ a game.")
(license license:zlib)))) (license license:zlib))))
(define-public asli (define-public asli
;; Use the newer version of ASLI that allows build with CGAL v5.6.
(let ((commit "4f4ba142ea7db6eecfdb546538c88a38680a83c5")
(revision "1"))
(package (package
(name "asli") (name "asli")
(version "0.1") (version (git-version "0.1" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/tpms-lattice/ASLI") (url "https://github.com/tpms-lattice/ASLI")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "02hwdavpsy3vmivd6prp03jn004ykrl11lbkvksy5i2zm38zbknr")) (base32 "122xxnj3dckmg6mh07x490564b2z9gd38cd0wc5zz3p4nshcq7wy"))
(patches (search-patches "asli-use-system-libs.patch")) (patches (search-patches "asli-use-system-libs.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -2876,7 +2879,6 @@ a game.")
;;(delete-file-recursively "libs/alglib") ; Missing from Guix ;;(delete-file-recursively "libs/alglib") ; Missing from Guix
(delete-file-recursively "libs/eigen") (delete-file-recursively "libs/eigen")
(delete-file-recursively "libs/mmg") (delete-file-recursively "libs/mmg")
;;(delete-file-recursively "libs/tetgen") ; Missing from Guix
(delete-file-recursively "libs/yaml"))))) (delete-file-recursively "libs/yaml")))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
@ -2923,7 +2925,7 @@ allows users to fill any 3D geometry with a functionally graded lattice. The
lattice infill is constructed out of unit cells, described by implicit lattice infill is constructed out of unit cells, described by implicit
functions, whose type, size and feature can be varied locally to obtain the functions, whose type, size and feature can be varied locally to obtain the
desired local properties.") desired local properties.")
(license license:agpl3+))) (license license:agpl3+))))
(define-public f3d (define-public f3d
(package (package

View file

@ -1,12 +1,20 @@
Adjust CMakeLists.txt to use system-provided mmg and yaml-cpp libraries. From edfff0027c3cdacbbc0f288078366058f598544d Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Wed, 14 Aug 2024 07:57:20 +0300
Subject: [PATCH] CMakeLists.txt: Adjust to use system libraries.
* CMakeLists.txt: Adjust to use system-provided mmg and yaml-cpp libraries.
---
CMakeLists.txt | 38 ++++++--------------------------------
1 file changed, 6 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index b11c5ba..702423e 100755 index ca2a01f9..c6eff22f 100755
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -122,28 +122,8 @@ if(MMG_MESH) @@ -113,28 +113,8 @@ endif()
add_definitions(-DMMG_MESH)
# Mmg and its components
# MMG # MMG
- set(MMG_PREFIX mmg3d) - set(MMG_PREFIX mmg3d)
- set(MMG_PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX}) - set(MMG_PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX})
@ -19,7 +27,7 @@ index b11c5ba..702423e 100755
- INSTALL_DIR ${MMG_INSTALL_DIR} - INSTALL_DIR ${MMG_INSTALL_DIR}
- -
- CMAKE_ARGS(-DCMAKE_BUILD_TYPE=Release -DBUILD=MMG3D -DLIBMMG3D_STATIC=ON - CMAKE_ARGS(-DCMAKE_BUILD_TYPE=Release -DBUILD=MMG3D -DLIBMMG3D_STATIC=ON
- -DLIBMMG3D_SHARED=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>) - -DLIBMMG3D_SHARED=OFF -DUSE_ELAS=OFF -DUSE_VTK=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
- -
- BUILD_COMMAND make - BUILD_COMMAND make
- INSTALL_COMMAND make install - INSTALL_COMMAND make install
@ -35,8 +43,8 @@ index b11c5ba..702423e 100755
# MshMet # MshMet
set(MSHMET_PREFIX mshmet) set(MSHMET_PREFIX mshmet)
@@ -192,14 +172,8 @@ target_include_directories(tet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/tetgen) @@ -174,14 +154,8 @@ target_include_directories(alg PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/alglib/sr
target_compile_definitions(tet PUBLIC TETLIBRARY) # -DTETLIBRARY: flag to compile tetgen as a library include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs/mTT/include)
# yaml # yaml
-file(GLOB yaml_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src/*.cpp) # Using file GLOB is not recomended! -file(GLOB yaml_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src/*.cpp) # Using file GLOB is not recomended!
@ -52,21 +60,22 @@ index b11c5ba..702423e 100755
# Compile options for debuging # Compile options for debuging
if(CMAKE_BUILD_TYPE MATCHES Debug) if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -259,7 +233,7 @@ if(MARCH_NATIVE) @@ -218,7 +192,7 @@ endif()
endif()
# Create entries for C++ files in "ASLI" routine # Create entries for C++ files in "ASLI" routine
-target_link_libraries(ASLI PUBLIC alg tet yaml) add_dependencies(ASLI ${MMG_PREFIX} ${MSHMET_PREFIX})
+target_link_libraries(ASLI PUBLIC alg tet ${YAML_CPP_LIBRARIES}) -target_link_libraries(ASLI PUBLIC alg yaml
if(NOT MSVC) +target_link_libraries(ASLI PUBLIC alg ${YAML_CPP_LIBRARIES}
target_link_libraries(ASLI PUBLIC stdc++fs) CGAL::CGAL CGAL::Eigen_support
endif() ${MMG3D_LIBRARIES} ${MSHMET_LIBRARIES}
@@ -272,7 +246,7 @@ if(CGAL_MESH) )
@@ -301,4 +275,4 @@ if(MSYS AND ASLI_DLL)
$<TARGET_FILE_DIR:ASLI>
)
endif() endif()
-endif()
\ No newline at end of file
+endif()
--
2.45.2
if(MMG_MESH)
- add_dependencies(ASLI ${MMG_PREFIX} ${MSHMET_PREFIX})
+ add_dependencies(ASLI ${MSHMET_PREFIX})
target_link_libraries(ASLI PUBLIC ${MMG3D_LIBRARIES} ${MSHMET_LIBRARIES})
if(SCOTCH_FOUND)
target_link_libraries(ASLI PUBLIC ${SCOTCH_LIBRARIES} scotch)