From 50ea8e4e4cddd33853ca3841340f412467116283 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Wed, 22 Aug 2012 14:20:57 -0700 Subject: [PATCH] added check header so cmake will fail if you are missing libwebsockets --- plugins/dbus/CMakeLists.txt | 4 ++-- plugins/dbus/dbusplugin.h | 6 ++++++ plugins/websocketsink/CMakeLists.txt | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/dbus/CMakeLists.txt b/plugins/dbus/CMakeLists.txt index a688c79..07464f3 100644 --- a/plugins/dbus/CMakeLists.txt +++ b/plugins/dbus/CMakeLists.txt @@ -3,8 +3,8 @@ include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs}) pkg_check_modules(gio REQUIRED gio-2.0) -set(dbussinkplugin_headers dbusplugin.h abstractproperty.h abstractdbusinterface.h dbusinterfacemanager.h accelerationproperty.h basicproperty.h) -set(dbussinkplugin_sources dbusplugin.cpp abstractproperty.cpp abstractdbusinterface.cpp dbusinterfacemanager.cpp accelerationproperty.cpp basicproperty.cpp) +set(dbussinkplugin_headers dbusplugin.h abstractproperty.h abstractdbusinterface.h dbusinterfacemanager.h accelerationproperty.h basicproperty.h properties.h) +set(dbussinkplugin_sources dbusplugin.cpp abstractproperty.cpp abstractdbusinterface.cpp dbusinterfacemanager.cpp accelerationproperty.cpp basicproperty.cpp properties.cpp) add_library(dbussinkplugin MODULE ${dbussinkplugin_sources}) set_target_properties(dbussinkplugin PROPERTIES PREFIX "") diff --git a/plugins/dbus/dbusplugin.h b/plugins/dbus/dbusplugin.h index abb7416..8007ec4 100644 --- a/plugins/dbus/dbusplugin.h +++ b/plugins/dbus/dbusplugin.h @@ -35,6 +35,12 @@ public: virtual std::string uuid(); protected: + template + void wantProperty(VehicleProperty::Property) + { + + } + PropertyDBusMap propertyDBusMap; }; diff --git a/plugins/websocketsink/CMakeLists.txt b/plugins/websocketsink/CMakeLists.txt index 2aac74c..eb1284b 100644 --- a/plugins/websocketsink/CMakeLists.txt +++ b/plugins/websocketsink/CMakeLists.txt @@ -1,6 +1,8 @@ - +include(CheckIncludeFiles) include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs}) +check_include_files(libwebsockets.h HAVE_WEBSOCKETS) + set(websocketsinkplugin_headers websocketsink.h websocketmanager.h) set(websocketsinkplugin_sources websocketsinkmanager.cpp websocketsink.cpp) add_library(websocketsinkplugin MODULE ${websocketsinkplugin_sources}) -- 2.7.4