Move pkg-config private libraries to Libs.private

parent 8dce7dd2
...@@ -7,7 +7,6 @@ Name: libpistache ...@@ -7,7 +7,6 @@ Name: libpistache
URL: http://pistache.io/ URL: http://pistache.io/
Description: An elegant C++ REST framework. Description: An elegant C++ REST framework.
Version: @version@ Version: @version@
Requires:
Libs: -L'${libdir}/' @libs@ Libs: -L'${libdir}/' @libs@
Libs.private: Libs.private: @libs_private@
Cflags: -I'${includedir}/' Cflags: -I'${includedir}/'
...@@ -16,7 +16,8 @@ project( ...@@ -16,7 +16,8 @@ project(
compiler = meson.get_compiler('cpp') compiler = meson.get_compiler('cpp')
compiler_id = compiler.get_id() compiler_id = compiler.get_id()
prefix = get_option('prefix') 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 # 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 # No need for -Wall -Wextra -Wpedantic, since warning_level is 3
...@@ -62,14 +63,14 @@ endif ...@@ -62,14 +63,14 @@ endif
##### END CheckAtomic.cmake ##### END CheckAtomic.cmake
if is_libatomic_needed if is_libatomic_needed
pc_libs += '-latomic' pc_libs_private += '-latomic'
endif endif
deps_libpistache = [dependency('threads'), dependency('RapidJSON', fallback: ['rapidjson', 'rapidjson_dep'])] deps_libpistache = [dependency('threads'), dependency('RapidJSON', fallback: ['rapidjson', 'rapidjson_dep'])]
if get_option('PISTACHE_USE_SSL') if get_option('PISTACHE_USE_SSL')
deps_libpistache += dependency('openssl') deps_libpistache += dependency('openssl')
pc_libs += ['-lssl', '-lcrypto'] pc_libs_private += ['-lssl', '-lcrypto']
endif endif
version_data_raw = '' version_data_raw = ''
...@@ -97,7 +98,8 @@ configure_file(input: 'libpistache.pc.in', output: 'libpistache.pc', install: ge ...@@ -97,7 +98,8 @@ configure_file(input: 'libpistache.pc.in', output: 'libpistache.pc', install: ge
'prefix': prefix, 'prefix': prefix,
'exec_prefix': prefix/get_option('bindir'), 'exec_prefix': prefix/get_option('bindir'),
'libdir': prefix/get_option('libdir'), 'libdir': prefix/get_option('libdir'),
'libs': ' '.join(pc_libs), 'libs': pc_lib,
'libs_private': ' '.join(pc_libs_private),
'includedir': prefix/get_option('includedir'), 'includedir': prefix/get_option('includedir'),
'version': pistache_version_str+'-git'+version_data_conf.get_unquoted('VERSION_GIT_DATE') 'version': pistache_version_str+'-git'+version_data_conf.get_unquoted('VERSION_GIT_DATE')
}) })
......
VERSION_MAJOR 0 VERSION_MAJOR 0
VERSION_MINOR 0 VERSION_MINOR 0
VERSION_PATCH 002 VERSION_PATCH 002
VERSION_GIT_DATE 20210107 VERSION_GIT_DATE 20210409
SONAME_VERSION_MAJOR 0 SONAME_VERSION_MAJOR 0
SONAME_VERSION_MINOR 0 SONAME_VERSION_MINOR 0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment