[fix] build file fixes for linux and newer CMake
Some checks failed
Verification / Is-Buildable (push) Failing after 2m51s
Some checks failed
Verification / Is-Buildable (push) Failing after 2m51s
:Release Notes: - :Detailed Notes: - :Testing Performed: - :QA Notes: - :Issues Addressed: -
This commit is contained in:
parent
603646c230
commit
5634773eaf
@ -41,7 +41,9 @@ git submodule init
|
||||
git submodule update
|
||||
# Next python:
|
||||
python3 -m venv .\venv
|
||||
.\.venv\Scripts\Activate.ps1
|
||||
.\venv\Scripts\Activate.ps1
|
||||
# or
|
||||
.\venv\bin\Activate.ps1
|
||||
pip install meson cmake
|
||||
meson setup -Ddefault_library=static build
|
||||
meson compile -C build
|
||||
|
||||
@ -13,6 +13,7 @@ glog_opt = cmake.subproject_options()
|
||||
glog_opt.add_cmake_defines({
|
||||
'WITH_GFLAGS': 'OFF',
|
||||
'WITH_GTEST': 'OFF',
|
||||
'CMAKE_POLICY_VERSION_MINIMUM': '3.5'
|
||||
})
|
||||
|
||||
libtype = get_option('default_library')
|
||||
|
||||
@ -1,56 +1,69 @@
|
||||
add_project_arguments('-DCRPC_SERVER_API_EXPORT -pthread', language: 'cpp')
|
||||
add_project_arguments('-DCRPC_SERVER_API_EXPORT', language: 'cpp')
|
||||
|
||||
cloud_point_rpc_sources = files(
|
||||
'rpc_coder.cpp',
|
||||
'rpc_server.cpp',
|
||||
'service.cpp',
|
||||
'server_api.cpp',
|
||||
'rpc_coder.cpp'
|
||||
'service.cpp',
|
||||
)
|
||||
|
||||
libcloud_point_rpc = shared_library('cloud_point_rpc',
|
||||
libcloud_point_rpc = shared_library(
|
||||
'cloud_point_rpc',
|
||||
cloud_point_rpc_sources,
|
||||
include_directories : inc,
|
||||
dependencies : [json_dep, thread_dep, glog_dep, yaml_dep, asio_dep, base64_dep],
|
||||
install : true)
|
||||
include_directories: inc,
|
||||
dependencies: [json_dep, thread_dep, glog_dep, yaml_dep, asio_dep, base64_dep],
|
||||
install: true,
|
||||
)
|
||||
|
||||
cloud_point_rpc_dep = declare_dependency(
|
||||
include_directories : inc,
|
||||
link_with : libcloud_point_rpc,
|
||||
dependencies : [json_dep, glog_dep, yaml_dep, asio_dep, base64_dep])
|
||||
include_directories: inc,
|
||||
link_with: libcloud_point_rpc,
|
||||
dependencies: [json_dep, glog_dep, yaml_dep, asio_dep, base64_dep],
|
||||
)
|
||||
|
||||
# Test lib
|
||||
libcloud_point_rpc_test = shared_library('test_cloud_point',
|
||||
libcloud_point_rpc_test = shared_library(
|
||||
'test_cloud_point',
|
||||
'test_api.cpp',
|
||||
dependencies: cloud_point_rpc_dep,
|
||||
install : true)
|
||||
install: true,
|
||||
)
|
||||
|
||||
cloud_point_rpc_test_dep = declare_dependency(
|
||||
include_directories: inc,
|
||||
link_with: libcloud_point_rpc_test,
|
||||
dependencies: [cloud_point_rpc_dep]
|
||||
dependencies: [cloud_point_rpc_dep],
|
||||
)
|
||||
|
||||
libcloud_point_rpc_cli = shared_library('libcloud_point_rpc_cli',
|
||||
libcloud_point_rpc_cli = shared_library(
|
||||
'libcloud_point_rpc_cli',
|
||||
'cli.cpp',
|
||||
include_directories : inc,
|
||||
dependencies : [cloud_point_rpc_dep],
|
||||
install : true)
|
||||
include_directories: inc,
|
||||
dependencies: [cloud_point_rpc_dep],
|
||||
install: true,
|
||||
)
|
||||
|
||||
cloud_point_rpc_cli_dep = declare_dependency(
|
||||
include_directories: inc,
|
||||
link_with: libcloud_point_rpc_cli,
|
||||
dependencies: [cloud_point_rpc_dep]
|
||||
dependencies: [cloud_point_rpc_dep],
|
||||
)
|
||||
|
||||
# Client/CLI tool (legacy stdin/stdout)
|
||||
executable('cloud_point_rpc_cli',
|
||||
['main.cpp', ],
|
||||
dependencies : cloud_point_rpc_cli_dep,
|
||||
install : true)
|
||||
executable(
|
||||
'cloud_point_rpc_cli',
|
||||
[
|
||||
'main.cpp',
|
||||
],
|
||||
dependencies: cloud_point_rpc_cli_dep,
|
||||
install: true,
|
||||
)
|
||||
|
||||
# Server executable (TCP)
|
||||
executable('cloud_point_rpc_server',
|
||||
executable(
|
||||
'cloud_point_rpc_server',
|
||||
'server_main.cpp',
|
||||
dependencies : cloud_point_rpc_dep,
|
||||
link_args : '-pthread',
|
||||
install : true)
|
||||
dependencies: cloud_point_rpc_dep,
|
||||
link_args: '-pthread',
|
||||
install: true,
|
||||
)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user