From patchwork Thu Sep 15 13:37:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 42639 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DCE0E27BBEA; Thu, 15 Sep 2022 14:38:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 473DD27BBE9 for ; Thu, 15 Sep 2022 14:38:37 +0100 (BST) Received: from localhost ([::1]:36238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYp4e-0005AU-C8 for patchwork@mira.cbaines.net; Thu, 15 Sep 2022 09:38:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYp47-00058e-BU for guix-patches@gnu.org; Thu, 15 Sep 2022 09:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40583) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYp47-0004X7-3c for guix-patches@gnu.org; Thu, 15 Sep 2022 09:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oYp46-0007fn-Vf for guix-patches@gnu.org; Thu, 15 Sep 2022 09:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56638] [PATCH] gnu: Add asli. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Sep 2022 13:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 56638@debbugs.gnu.org Received: via spool by 56638-submit@debbugs.gnu.org id=B56638.166324904629423 (code B ref 56638); Thu, 15 Sep 2022 13:38:02 +0000 Received: (at 56638) by debbugs.gnu.org; 15 Sep 2022 13:37:26 +0000 Received: from localhost ([127.0.0.1]:57510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oYp3V-0007eT-B5 for submit@debbugs.gnu.org; Thu, 15 Sep 2022 09:37:26 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:44801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oYp3P-0007eA-Kr for 56638@debbugs.gnu.org; Thu, 15 Sep 2022 09:37:24 -0400 Date: Thu, 15 Sep 2022 13:37:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663249033; x=1663508233; bh=BUZ/q27b9yIBOWeLkqFzSt6R3lE9Ppsm2WEyWOp71mE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=MR0iA4DQEkDfKb2Z7edmzVRkzuRawt6y+2HqtzUl/od7IPlNvFLMeX4IY/x8WqIeJ 1trzLVa5EWhXZ1RVwijvGXNuOe3YOUNfd2vgULe6u31zvkKuS63F9bajZlQoBX/ZSg 0Qb1Tfvuc6faJc5rCG+Uq2JH50aLSnapv2Z5T1EWKmBIsLpqBZUUpe6yPUhwDh/oaS PIe4xJdq6x4twPJoUV+G9bqVrwxYF/KF+hL/bIdxL0GVFo8zemSDzzjHouIyzL+KCS eNrDjyMNxzD9OhuHV4qTWrZTG39ZRBlr0Gg28qhWKmo/P/lqNsXseNM7MbS96FFb9a rye5wKCQ2R8fQ== From: "Paul A. Patience" Message-ID: <87k064u5he.fsf@apatience.com> In-Reply-To: <87pmfxvevb.fsf_-_@gnu.org> References: <20220719075934.67481-1-paul@apatience.com> <20220902203420.17483-1-paul@apatience.com> <87pmfxvevb.fsf_-_@gnu.org> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Ludo, On 2022-09-14 17:13:28-04:00, Ludovic Courtès wrote: > And I have: > > $ sha256sum gnu/packages/patches/asli-use-system-libs.patch > 1a922b39a53b8cb0bd99e6c94e90769efaad88634b56d8df03811f68e45a003c gnu/packages/patches/asli-use-system-libs.patch > > Am I missing something? Thanks for the shasum; it allowed me to discover the problem. There are trailing spaces in the original CMakeLists.txt, which also appear in the patch. When sending the patch inline, these spaces are trimmed. (The spaces are highlighted in Magit, so I was aware of them, but I didn't realize they would be trimmed somewhere in the email pipeline.) I will attach the patch file separately, and also a tarred version just in case. So you can verify that you have the right one, here's my shasum: --8<---------------cut here---------------start------------->8--- $ sha256sum gnu/packages/patches/asli-use-system-libs.patch fb1531a4f71e95354af6927175f67b90f39250604aa6859d9def4778027f1810 gnu/packages/patches/asli-use-system-libs.patch --8<---------------cut here---------------end--------------->8--- Best regards, Paul Adjust CMakeLists.txt to use system-provided mmg and yaml-cpp libraries. diff --git a/CMakeLists.txt b/CMakeLists.txt index b11c5ba..702423e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,28 +122,8 @@ if(MMG_MESH) add_definitions(-DMMG_MESH) # MMG - set(MMG_PREFIX mmg3d) - set(MMG_PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX}) - set(MMG_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX}) - ExternalProject_Add(${MMG_PREFIX} - PREFIX ${MMG_PREFIX_DIR} - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/mmg - - BUILD_ALWAYS OFF - INSTALL_DIR ${MMG_INSTALL_DIR} - - CMAKE_ARGS(-DCMAKE_BUILD_TYPE=Release -DBUILD=MMG3D -DLIBMMG3D_STATIC=ON - -DLIBMMG3D_SHARED=OFF -DCMAKE_INSTALL_PREFIX=) - - BUILD_COMMAND make - INSTALL_COMMAND make install - ) - set(MMG3D_INCLUDE_DIRS "${MMG_INSTALL_DIR}/include") - set(MMG3D_LIBRARIES "${MMG_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${MMG_PREFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") - - include_directories(${MMG3D_INCLUDE_DIRS}) - #add_library(MMG3D STATIC IMPORTED) - #set_target_properties(MMG3D PROPERTIES IMPORTED_LOCATION "${MMG3D_LIBRARIES}") + include_directories(${MMG_INCLUDE_DIR}) + set(MMG3D_LIBRARIES ${MMG_LIBRARY_DIR}/libmmg3d.so) # MshMet set(MSHMET_PREFIX mshmet) @@ -192,14 +172,8 @@ target_include_directories(tet PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/tetgen) target_compile_definitions(tet PUBLIC TETLIBRARY) # -DTETLIBRARY: flag to compile tetgen as a library # yaml -file(GLOB yaml_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src/*.cpp) # Using file GLOB is not recomended! -add_library(yaml STATIC) -target_include_directories(yaml - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/include - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src -) -target_sources(yaml PRIVATE ${yaml_SRC}) -set_target_properties(yaml PROPERTIES CXX_STANDARD 11) +find_package(yaml-cpp REQUIRED) +include_directories(${YAML_CPP_INCLUDE_DIRS}) # Compile options for debuging if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -259,7 +233,7 @@ if(MARCH_NATIVE) endif() # Create entries for C++ files in "ASLI" routine -target_link_libraries(ASLI PUBLIC alg tet yaml) +target_link_libraries(ASLI PUBLIC alg tet ${YAML_CPP_LIBRARIES}) if(NOT MSVC) target_link_libraries(ASLI PUBLIC stdc++fs) endif() @@ -272,7 +246,7 @@ if(CGAL_MESH) endif() 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)