~thomas-voss/location-service/add-ichnaea-provider-next

« back to all changes in this revision

Viewing changes to src/location/CMakeLists.txt

Committer: Thomas Voß
Date: 2016-07-13 14:06:18 UTC
Revision ID: thomas.voss@canonical.com-20160713140618-k3rmfj6ydyx82q95

First wave of removals of obsolete code and targets.

files added:
src/location/cmds/monitor.cpp

src/location/cmds/monitor.h

files removed:
examples/service

examples/service/CMakeLists.txt

examples/service/client.cpp

examples/service/program_options.h

examples/service/service.1.ronn

examples/service/service.cpp

examples/service/service.md

examples/service/ubuntu-location-service.1

src/location/init_and_shutdown.cpp

src/location/init_and_shutdown.h

src/location/providers/dummy/delayed_provider.cpp

src/location/providers/dummy/delayed_provider.h

src/location/service

src/location/service/configuration.h

src/location/service/daemon.cpp

src/location/service/daemon.h

src/location/service/daemon_cli_main.cpp

src/location/service/daemon_main.cpp

src/location/service/dbus_connection_factory.h

src/location/service/default_configuration.cpp

src/location/service/default_configuration.h

src/location/service/default_permission_manager.cpp

src/location/service/default_permission_manager.h

src/location/service/demultiplexing_reporter.cpp

src/location/service/demultiplexing_reporter.h

src/location/service/harvester.cpp

src/location/service/harvester.h

src/location/service/ichnaea_reporter.cpp

src/location/service/ichnaea_reporter.h

src/location/service/implementation.cpp

src/location/service/implementation.h

src/location/service/interface.h

src/location/service/permission_manager.h

src/location/service/program_options.h

src/location/service/provider_daemon.cpp

src/location/service/provider_daemon.h

src/location/service/provider_daemon_main.cpp

src/location/service/runtime.cpp

src/location/service/runtime.h

src/location/service/runtime_tests.cpp

src/location/service/runtime_tests.h

src/location/service/session

src/location/service/session/implementation.cpp

src/location/service/session/implementation.h

src/location/service/session/interface.cpp

src/location/service/session/interface.h

src/location/service/session/interface_p.h

src/location/service/session/skeleton.cpp

src/location/service/session/skeleton.h

src/location/service/session/stub.cpp

src/location/service/session/stub.h

src/location/service/skeleton.cpp

src/location/service/skeleton.h

src/location/service/state.cpp

src/location/service/state.h

src/location/service/stub.cpp

src/location/service/stub.h

src/location/service/trust_store_permission_manager.cpp

src/location/service/trust_store_permission_manager.h

tests/default_permission_manager_test.cpp

tests/delayed_service_test.cpp

files renamed:
src/location/service/config.h.in => src/location/config.h.in

files modified:
examples/CMakeLists.txt

include/location/position.h

include/location/service.h

src/location/CMakeLists.txt

src/location/cmds/provider.cpp

src/location/cmds/provider.h

src/location/cmds/run.cpp

src/location/cmds/run.h

src/location/cmds/status.cpp

src/location/cmds/status.h

src/location/daemon.cpp

src/location/dbus/codec.h

src/location/dbus/service.h

src/location/dbus/skeleton/service.cpp

src/location/dbus/skeleton/service.h

src/location/dbus/skeleton/session.cpp

src/location/dbus/stub/service.cpp

src/location/dbus/stub/service.h

src/location/providers/config.cpp

src/location/providers/dummy/CMakeLists.txt

src/location/providers/dummy/provider.cpp

src/location/providers/remote/stub.cpp

src/location/service_with_engine.cpp

src/location/service_with_engine.h

src/location/trust_store_permission_manager.cpp

tests/CMakeLists.txt

tests/acceptance_tests.cpp

tests/bug_1447110.cpp

tests/daemon_and_cli_tests.cpp

tests/runtime_test.cpp

tests/trust_store_permission_manager_test.cpp

Show diffs side-by-side

added added

removed removed

src/location/CMakeLists.txt

add_definitions(-DLOCATION_HAVE_UBUNTU_PLATFORM_HARDWARE_API)

endif()

set(ICHNAEA_REPORTER_SRCS service/ichnaea_reporter.cpp)

add_subdirectory(providers)

configure_file(

service/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/service/config.h @ONLY

config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY

)

include_directories(${UBUNTU_PLATFORM_HARDWARE_API_INCLUDE_DIRS})

criteria.cpp

engine.cpp

fusion_provider.cpp

init_and_shutdown.cpp

position.cpp

provider.cpp

provider_factory.cpp

cmds/list.h

cmds/list.cpp

cmds/monitor.h

cmds/monitor.cpp

cmds/provider.h

cmds/provider.cpp

cmds/run.h

dbus/stub/session.h

dbus/stub/session.cpp

service/default_configuration.cpp

service/default_permission_manager.cpp

service/harvester.cpp

service/demultiplexing_reporter.h

service/demultiplexing_reporter.cpp

service/runtime.cpp

service/runtime_tests.h

service/runtime_tests.cpp

service/state.cpp

service/trust_store_permission_manager.cpp

100

service/implementation.cpp

101

service/skeleton.cpp

102

service/stub.cpp

103

104

service/session/implementation.cpp

105

service/session/interface.cpp

106

service/session/skeleton.cpp

107

service/session/stub.cpp

108

109

providers/config.cpp

110

111

providers/remote/provider.cpp

112

providers/remote/skeleton.cpp

113

providers/remote/stub.cpp

114

115

${ICHNAEA_REPORTER_SRCS}

116

)

117

118

add_library(

195

172

DESTINATION ${CMAKE_INSTALL_LIBDIR}

196

173

)

197

174

198

add_library(

199

ubuntu-location-service-provider-daemon

200

201

service/provider_daemon.cpp

202

)

203

204

add_library(

205

ubuntu-location-service-daemon

206

207

service/daemon.cpp

208

)

209

210

add_executable(

211

ubuntu-location-service-providerd

212

213

service/provider_daemon_main.cpp

214

)

215

216

add_executable(

217

ubuntu-location-serviced

218

219

service/daemon_main.cpp

220

)

221

222

add_executable(

223

ubuntu-location-serviced-cli

224

225

service/daemon_cli_main.cpp

226

)

227

228

175

add_executable(

229

176

locationd

230

177

232

179

)

233

180

234

181

target_link_libraries(

235

ubuntu-location-service-provider-daemon

236

237

ubuntu-location-service

238

)

239

240

target_link_libraries(

241

ubuntu-location-service-daemon

242

243

ubuntu-location-service

244

)

245

246

target_link_libraries(

247

ubuntu-location-service-providerd

248

249

ubuntu-location-service-provider-daemon

250

251

${ENABLED_PROVIDER_TARGETS}

252

253

${Boost_LIBRARIES}

254

${DBUS_LIBRARIES}

255

${DBUS_CPP_LIBRARIES}

256

${GLog_LIBRARY}

257

${GFlags_LIBRARY}

258

)

259

260

target_link_libraries(

261

ubuntu-location-serviced

262

263

ubuntu-location-service-daemon

264

265

${ENABLED_PROVIDER_TARGETS}

266

267

${Boost_LIBRARIES}

268

${DBUS_LIBRARIES}

269

${DBUS_CPP_LIBRARIES}

270

${GLog_LIBRARY}

271

${GFlags_LIBRARY}

272

)

273

274

target_link_libraries(

275

ubuntu-location-serviced-cli

276

277

ubuntu-location-service-daemon

278

279

${ENABLED_PROVIDER_TARGETS}

280

281

${Boost_LIBRARIES}

282

${DBUS_LIBRARIES}

283

${DBUS_CPP_LIBRARIES}

284

${GLog_LIBRARY}

285

${GFlags_LIBRARY}

286

)

287

288

target_link_libraries(

289

182

locationd

290

183

291

184

ubuntu-location-service

292

185

293

186

${ENABLED_PROVIDER_TARGETS}

294

295

# ${Boost_LIBRARIES}

296

# ${DBUS_LIBRARIES}

297

# ${DBUS_CPP_LIBRARIES}

298

# ${GLog_LIBRARY}

299

# ${GFlags_LIBRARY}

300

)

301

302

install(

303

TARGETS ubuntu-location-service-providerd

304

DESTINATION ${CMAKE_INSTALL_BINDIR}

305

)

306

307

install(

308

TARGETS ubuntu-location-serviced

309

DESTINATION ${CMAKE_INSTALL_BINDIR}

310

)

311

312

install(

313

TARGETS ubuntu-location-serviced-cli

314

DESTINATION ${CMAKE_INSTALL_BINDIR}

315

187

)

316

188

317

189

install(

Older »