1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Wed, 05 Oct 2022 12:57:29 +0200
Description: There is nothing to copy if libcpptoml-dev package is used
Forwarded: not-needed
--- a/scripts/install-cpptoml
+++ b/scripts/install-cpptoml
@@ -12,4 +12,4 @@
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
-cp "${MESON_SOURCE_ROOT}/subprojects/cpptoml/include/cpptoml.h" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
+#cp "${MESON_SOURCE_ROOT}/subprojects/cpptoml/include/cpptoml.h" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
--- a/scripts/install-sdsl-lite
+++ b/scripts/install-sdsl-lite
@@ -12,4 +12,4 @@
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/include"
-cp -r "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite/include/sdsl" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
+#cp -r "${MESON_SOURCE_ROOT}/subprojects/sdsl-lite/include/sdsl" "${DESTDIR}/${MESON_INSTALL_PREFIX}/include/btllib/"
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,7 @@
endif
global_args = []
-global_link_args = [ '-ldl' ]
+global_link_args = [ '-ldl', '-lsdsl' ]
if compiler_id == 'clang'
global_link_args += [ '-lstdc++', '-lm' ]
@@ -53,8 +53,8 @@
meson.add_install_script('scripts/install-cpptoml')
meson.add_install_script('scripts/install-sdsl-lite')
-argparse_subproject = cmake.subproject('argparse') # , options : cmake_options)
-argparse_dep = argparse_subproject.dependency('argparse')
+# argparse_subproject = cmake.subproject('argparse', options : cmake_options)
+# argparse_dep = argparse_subproject.dependency('argparse')
# Run time dependencies
# ===========================================================
--- a/recipes/meson.build
+++ b/recipes/meson.build
@@ -10,7 +10,7 @@
executable('randseq',
meson.project_source_root() + '/recipes/randseq.cpp',
include_directories : btllib_include,
- dependencies : deps + [ btllib_dep, argparse_dep ],
+ dependencies : deps + [ btllib_dep ],
install : true,
install_dir : 'bin',
override_options : ['cpp_std=c++17'])
|