Commit 6c1ca571 authored by user's avatar user
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bindings/cpp/testBin/IncomingRelayTests
#	bindings/cpp/testBin/IntroductionTest
parents cf443124 17225ecb
<?xml version="1.0" encoding="UTF-8"?>
<module type="CPP_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/platform.h.in" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relaymq_selftest.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_auth.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/rmq_msg.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_crypto.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_source.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_event.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/application_template.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/librelaymq.pc.in" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_source.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_protocol.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_peer.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_crypto.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_identity.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_target.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/peer_table.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_event.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_target.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_context.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_context.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_peer.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_handle.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_auth.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/peer_table.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_protocol.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/relay_handle.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/rmq_msg.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Findlibzmq.cmake" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Findczmq.cmake" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="Header Search Paths">
<CLASSES>
<root url="file:///usr/lib/gcc/x86_64-linux-gnu/5/include" />
<root url="file:///usr/lib/gcc/x86_64-linux-gnu/5/include-fixed" />
<root url="file:///usr/include" />
<root url="file:///usr/local/include" />
</CLASSES>
<SOURCES>
<root url="file:///usr/lib/gcc/x86_64-linux-gnu/5/include" />
<root url="file:///usr/lib/gcc/x86_64-linux-gnu/5/include-fixed" />
<root url="file:///usr/include" />
<root url="file:///usr/local/include" />
</SOURCES>
</library>
</orderEntry>
</component>
</module>
\ No newline at end of file
......@@ -11,6 +11,8 @@ project(relaymq)
enable_language(C)
enable_testing()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
########################################################################
......
Supports Markdown
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