From 8f03ca270d1aa5dcafa945c941cf52ff14cb47da Mon Sep 17 00:00:00 2001 Message-Id: <8f03ca270d1aa5dcafa945c941cf52ff14cb47da.1682600200.git.dev@jpoiret.xyz> From: Josselin Poiret Date: Thu, 27 Apr 2023 14:51:51 +0200 Subject: [PATCH] Use provided catch2 From: Josselin Poiret --- CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddab64e..2d5eac8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ project(tl-expected include(CMakePackageConfigHelpers) include(CMakeDependentOption) include(GNUInstallDirs) -include(FetchContent) include(CTest) if (NOT DEFINED CMAKE_CXX_STANDARD) @@ -63,14 +62,7 @@ install(FILES install(DIRECTORY "include/" TYPE INCLUDE) if(EXPECTED_BUILD_TESTS) - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - set(CATCH_INSTALL_HELPERS OFF) - set(CATCH_BUILD_TESTING OFF) - set(CATCH_INSTALL_DOCS OFF) - FetchContent_Declare(Catch2 URL - https://github.com/catchorg/Catch2/archive/v2.13.10.zip) - FetchContent_MakeAvailable(Catch2) - + find_package(Catch2 CONFIG) file(GLOB test-sources CONFIGURE_DEPENDS tests/*.cpp) list(FILTER test-sources EXCLUDE REGEX "tests/test.cpp") add_executable(${PROJECT_NAME}-tests "${test-sources}") -- 2.39.2 3a'>treecommitdiff
path: root/gnu/packages/serialization.scm
AgeCommit message (Expand)Author
2024-01-10gnu: yaml-cpp: Update to 0.8.0....* gnu/packages/serialization.scm (yaml-cpp): Update to 0.8.0. Change-Id: I927111f2d103dbb30ff336b64dd4ab90c22312a0 Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Zheng Junjie
2024-01-09gnu: msgpack: Deprecate with msgpack-c....* gnu/packages/serialization.scm (msgpack-c): New variable. (msgpack-cxx): New variable. (msgpack): Rename to... (msgpack-3): ... this, and inherit from msgpack-c. * gnu/packages/vim.scm (eovim) [arguments]: Add help-cmake-find-msgpack-c phase. [inputs]: Replace msgpack with msgpack-c. * gnu/packages/terminals.scm (tmate) [inputs]: Replace msgpack with msgpack-3. * gnu/packages/networking.scm (opendht) [propagated-inputs]: Replace msgpack with msgpack-cxx. * gnu/packages/chemistry.scm (mmtf-cpp) [propagated-inputs]: Likewise. Maxim Cournoyer
2023-10-22gnu: Add python-flatbuffers....* gnu/packages/serialization.scm (python-flatbuffers): New variable. Ricardo Wurmus
2023-09-17gnu: Remove extraneous imports....Found by running 'guild compile -W3 gnu/packages/$module.scm', using guild from the upcoming Guile. * gnu/packages/admin.scm: Remove extraneous imports. * gnu/packages/avr.scm: Likewise. * gnu/packages/base.scm: Likewise. * gnu/packages/bootloaders.scm: Likewise. * gnu/packages/firmware.scm: Likewise. * gnu/packages/linphone.scm: Likewise. * gnu/packages/telephony.scm: Likewise. * gnu/packages/cran.scm: Likewise. * gnu/packages/kde.scm: Likewise. * gnu/packages/libcanberra.scm: Likewise. * gnu/packages/libreoffice.scm: Likewise. * gnu/packages/mes.scm: Likewise. * gnu/packages/mingw.scm: Likewise. * gnu/packages/serialization.scm: Likewise. * gnu/packages/sync.scm: Likewise. * gnu/packages/syncthing.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/emulators.scm: Likewise. Reviewed-by: Ludovic Courtès <ludo@gnu.org> Maxim Cournoyer
2023-09-08gnu: tensorflow-lite: Update to 2.12.1....* gnu/packages/algebra.scm (eigen-for-tensorflow-lite): Remove variable. * gnu/packages/machine-learning.scm (tensorflow-lite): Update to 2.12.1 [arguments]<configure-flags>: Turn on GPU and RUY use; Use cmake to find packages already in Guix as dependencies for absl-cpp, eigen, flatbuffer, neon2ssl, cpuinfo, ruy. [arguments]<phases>: Remove operations setting up absl-cpp, eigen, ruy, and neon2ssl as native inouts as now we use Guix's packages of these as dependencies. Do default build phase. Add steps to install C shared library and benchmark_model tool. [inputs]: Add cpuinfo, eigen, fp16, mesa-header, opencl, pthreadpool, ruy, vulkan and xnnpack as explicit inputs. [native-inputs]: Remove local setup of neon2ssl and ruy as we now use Guix's packages of these as explicit dependencies. * gnu/packages/serialization.scm (flatbuffers-next-shared): New variable, flatbuffers-next built with -fPIC as needed by tensorflow-lite. Signed-off-by: Ricardo Wurmus <rekado@elephly.net> Andy Tai