Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
pistache
Commits
923a4f16
Unverified
Commit
923a4f16
authored
Apr 09, 2021
by
Andrea Pappacoda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move pkg-config private libraries to Libs.private
parent
8dce7dd2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
libpistache.pc.in
libpistache.pc.in
+1
-2
meson.build
meson.build
+6
-4
version.txt
version.txt
+1
-1
No files found.
libpistache.pc.in
View file @
923a4f16
...
...
@@ -7,7 +7,6 @@ Name: libpistache
URL: http://pistache.io/
Description: An elegant C++ REST framework.
Version: @version@
Requires:
Libs: -L'${libdir}/' @libs@
Libs.private:
Libs.private:
@libs_private@
Cflags: -I'${includedir}/'
meson.build
View file @
923a4f16
...
...
@@ -16,7 +16,8 @@ project(
compiler = meson.get_compiler('cpp')
compiler_id = compiler.get_id()
prefix = get_option('prefix')
pc_libs = ['-lpistache', '-pthread']
pc_lib = '-lpistache'
pc_libs_private = ['-pthread']
# Wrapping arguments inside a call to get_supported_arguments so that only supported arguments get applied
# No need for -Wall -Wextra -Wpedantic, since warning_level is 3
...
...
@@ -62,14 +63,14 @@ endif
##### END CheckAtomic.cmake
if is_libatomic_needed
pc_libs += '-latomic'
pc_libs
_private
+= '-latomic'
endif
deps_libpistache = [dependency('threads'), dependency('RapidJSON', fallback: ['rapidjson', 'rapidjson_dep'])]
if get_option('PISTACHE_USE_SSL')
deps_libpistache += dependency('openssl')
pc_libs += ['-lssl', '-lcrypto']
pc_libs
_private
+= ['-lssl', '-lcrypto']
endif
version_data_raw = ''
...
...
@@ -97,7 +98,8 @@ configure_file(input: 'libpistache.pc.in', output: 'libpistache.pc', install: ge
'prefix': prefix,
'exec_prefix': prefix/get_option('bindir'),
'libdir': prefix/get_option('libdir'),
'libs': ' '.join(pc_libs),
'libs': pc_lib,
'libs_private': ' '.join(pc_libs_private),
'includedir': prefix/get_option('includedir'),
'version': pistache_version_str+'-git'+version_data_conf.get_unquoted('VERSION_GIT_DATE')
})
...
...
version.txt
View file @
923a4f16
VERSION_MAJOR 0
VERSION_MINOR 0
VERSION_PATCH 002
VERSION_GIT_DATE 20210
107
VERSION_GIT_DATE 20210
409
SONAME_VERSION_MAJOR 0
SONAME_VERSION_MINOR 0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment