Commit 84f35eff authored by Shervin Nourbakhsh's avatar Shervin Nourbakhsh

Propagation of changes in cameo-api-cpp:

 - changed package name for the c++ api from 'cameo' to 'cameo-api-cpp'
 - changed path for header files from 'include/cameo' to 'include/cameo/api'
 - correctly using imported target name from 'cameo' to 'Cameo::cameo-api-cpp'
 - removing explicit dependency on zmq since it is propagated from cameo-api-cpp
parent ee6f97de
......@@ -18,7 +18,7 @@ if (NOT DEFINED CMAKE_CXX_STANDARD)
endif()
find_package(cameo 1.1 REQUIRED)
find_package(cameo-api-cpp 1.1 REQUIRED)
#------------------------------------------------------------
# Programs
......@@ -27,100 +27,100 @@ find_package(cameo 1.1 REQUIRED)
# Tests
add_executable(simple cpp/src/tests/Simple.cpp)
target_link_libraries(simple PUBLIC cameo zmq)
target_link_libraries(simple PRIVATE Cameo::cameo-api-cpp )
add_executable(testsimple cpp/src/tests/TestSimple.cpp)
target_link_libraries(testsimple PUBLIC cameo zmq)
target_link_libraries(testsimple PRIVATE Cameo::cameo-api-cpp )
add_executable(veryfast cpp/src/tests/VeryFast.cpp)
target_link_libraries(veryfast PUBLIC cameo zmq)
target_link_libraries(veryfast PRIVATE Cameo::cameo-api-cpp )
add_executable(testveryfast cpp/src/tests/TestVeryFast.cpp)
target_link_libraries(testveryfast PUBLIC cameo zmq)
target_link_libraries(testveryfast PRIVATE Cameo::cameo-api-cpp )
add_executable(stop cpp/src/tests/Stop.cpp)
target_link_libraries(stop PUBLIC cameo zmq)
target_link_libraries(stop PRIVATE Cameo::cameo-api-cpp )
add_executable(teststop cpp/src/tests/TestStop.cpp)
target_link_libraries(teststop PUBLIC cameo zmq)
target_link_libraries(teststop PRIVATE Cameo::cameo-api-cpp )
add_executable(result cpp/src/tests/Result.cpp)
target_link_libraries(result PUBLIC cameo zmq)
target_link_libraries(result PRIVATE Cameo::cameo-api-cpp )
add_executable(testresult cpp/src/tests/TestResult.cpp)
target_link_libraries(testresult PUBLIC cameo zmq)
target_link_libraries(testresult PRIVATE Cameo::cameo-api-cpp )
add_executable(error cpp/src/tests/Error.cpp)
target_link_libraries(error PUBLIC cameo zmq)
target_link_libraries(error PRIVATE Cameo::cameo-api-cpp )
add_executable(testerror cpp/src/tests/TestError.cpp)
target_link_libraries(testerror PUBLIC cameo zmq)
target_link_libraries(testerror PRIVATE Cameo::cameo-api-cpp )
add_executable(teststorage cpp/src/tests/TestStorage.cpp)
target_link_libraries(teststorage PUBLIC cameo zmq)
target_link_libraries(teststorage PRIVATE Cameo::cameo-api-cpp )
add_executable(waitstorage cpp/src/tests/WaitStorage.cpp)
target_link_libraries(waitstorage PUBLIC cameo zmq)
target_link_libraries(waitstorage PRIVATE Cameo::cameo-api-cpp )
add_executable(testwaitstorage cpp/src/tests/TestWaitStorage.cpp)
target_link_libraries(testwaitstorage PUBLIC cameo zmq)
target_link_libraries(testwaitstorage PRIVATE Cameo::cameo-api-cpp )
add_executable(publisher cpp/src/tests/Publisher.cpp)
target_link_libraries(publisher PUBLIC cameo zmq)
target_link_libraries(publisher PRIVATE Cameo::cameo-api-cpp )
add_executable(testpublisher cpp/src/tests/TestPublisher.cpp)
target_link_libraries(testpublisher PUBLIC cameo zmq)
target_link_libraries(testpublisher PRIVATE Cameo::cameo-api-cpp )
add_executable(subscriber cpp/src/tests/Subscriber.cpp)
target_link_libraries(subscriber PUBLIC cameo zmq)
target_link_libraries(subscriber PRIVATE Cameo::cameo-api-cpp )
add_executable(testsubscriber cpp/src/tests/TestSubscriber.cpp)
target_link_libraries(testsubscriber PUBLIC cameo zmq)
target_link_libraries(testsubscriber PRIVATE Cameo::cameo-api-cpp )
add_executable(responder cpp/src/tests/Responder.cpp)
target_link_libraries(responder PUBLIC cameo zmq)
target_link_libraries(responder PRIVATE Cameo::cameo-api-cpp )
add_executable(testresponder cpp/src/tests/TestResponder.cpp)
target_link_libraries(testresponder PUBLIC cameo zmq)
target_link_libraries(testresponder PRIVATE Cameo::cameo-api-cpp )
add_executable(requester cpp/src/tests/Requester.cpp)
target_link_libraries(requester PUBLIC cameo zmq)
target_link_libraries(requester PRIVATE Cameo::cameo-api-cpp )
add_executable(testrequester cpp/src/tests/TestRequester.cpp)
target_link_libraries(testrequester PUBLIC cameo zmq)
target_link_libraries(testrequester PRIVATE Cameo::cameo-api-cpp )
add_executable(publisherloop cpp/src/tests/PublisherLoop.cpp)
target_link_libraries(publisherloop PUBLIC cameo zmq)
target_link_libraries(publisherloop PRIVATE Cameo::cameo-api-cpp )
add_executable(testcancel cpp/src/tests/TestCancel.cpp)
target_link_libraries(testcancel PUBLIC cameo zmq pthread)
target_link_libraries(testcancel PRIVATE Cameo::cameo-api-cpp pthread)
add_executable(openport cpp/src/tests/OpenPort.cpp)
target_link_libraries(openport PUBLIC cameo zmq)
target_link_libraries(openport PRIVATE Cameo::cameo-api-cpp )
add_executable(comport cpp/src/tests/ComPort.cpp)
target_link_libraries(comport PUBLIC cameo zmq)
target_link_libraries(comport PRIVATE Cameo::cameo-api-cpp )
add_executable(testcomport cpp/src/tests/TestComPort.cpp)
target_link_libraries(testcomport PUBLIC cameo zmq)
target_link_libraries(testcomport PRIVATE Cameo::cameo-api-cpp )
add_executable(stream cpp/src/tests/Stream.cpp)
target_link_libraries(stream PUBLIC cameo zmq)
target_link_libraries(stream PRIVATE Cameo::cameo-api-cpp )
add_executable(teststream cpp/src/tests/TestStream.cpp)
target_link_libraries(teststream PUBLIC cameo zmq pthread)
target_link_libraries(teststream PRIVATE Cameo::cameo-api-cpp pthread)
# Examples
add_executable(responderapp cpp/src/examples/ResponderApp.cpp)
target_link_libraries(responderapp PUBLIC cameo zmq)
target_link_libraries(responderapp PRIVATE Cameo::cameo-api-cpp )
add_executable(requesterapp cpp/src/examples/RequesterApp.cpp)
target_link_libraries(requesterapp PUBLIC cameo zmq)
target_link_libraries(requesterapp PRIVATE Cameo::cameo-api-cpp )
add_executable(publisherapp cpp/src/examples/PublisherApp.cpp)
target_link_libraries(publisherapp PUBLIC cameo zmq)
target_link_libraries(publisherapp PRIVATE Cameo::cameo-api-cpp )
add_executable(subscriberapp cpp/src/examples/SubscriberApp.cpp)
target_link_libraries(subscriberapp PUBLIC cameo zmq)
target_link_libraries(subscriberapp PRIVATE Cameo::cameo-api-cpp )
......@@ -18,7 +18,7 @@
#include <string>
#include <vector>
#include <sstream>
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
using namespace std;
using namespace cameo;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
#include <chrono>
......
......@@ -15,7 +15,7 @@
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
#include <sstream>
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -15,7 +15,7 @@
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -18,7 +18,7 @@
#include <string>
#include <vector>
#include <sstream>
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
using namespace std;
using namespace cameo;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <thread>
#include <iostream>
......
......@@ -18,7 +18,7 @@
#include <string>
#include <vector>
#include <sstream>
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
using namespace std;
using namespace cameo;
......
......@@ -15,7 +15,7 @@
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -15,7 +15,7 @@
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -15,7 +15,7 @@
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -15,7 +15,7 @@
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h>
#include <rapidjson/document.h>
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <iostream>
using namespace std;
......
......@@ -18,7 +18,7 @@
#include <string>
#include <vector>
#include <sstream>
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
using namespace std;
using namespace cameo;
......
......@@ -18,7 +18,7 @@
#include <string>
#include <vector>
#include <sstream>
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
using namespace std;
using namespace cameo;
......
......@@ -14,7 +14,7 @@
* limitations under the Licence.
*/
#include <cameo/cameo.h>
#include <cameo/api/cameo.h>
#include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h>
#include <rapidjson/document.h>
......
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