Bugfix cmake related files

Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
This commit is contained in:
tomoaki
2021-04-30 14:55:22 +09:00
parent c12e93122f
commit 2bf7985e2b
5 changed files with 25 additions and 27 deletions

View File

@@ -13,11 +13,17 @@
# Contributors:
# a1lu - initial version
#*******************************************************************************/
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../Build)
PROJECT(mqtt-sn-gateway CXX)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
set(CMAKE_CXX_STANDARD 11)
SET(OS linux)
SET(SENSORNET udp)
if(NOT DEFINED SENSORNET)
set(SENSORNET udp)
endif()
message(STATUS "SENSORNET: " ${SENSORNET})
ADD_LIBRARY(mqtt-sngateway_common
MQTTGWConnectionHandler.cpp
@@ -58,7 +64,6 @@ ADD_LIBRARY(mqtt-sngateway_common
${OS}/Threading.h
)
include_directories(../../MQTTSNPacket/src)
link_directories("/usr/local/lib")
link_directories("/usr/local/opt/openssl/lib")
@@ -68,12 +73,12 @@ TARGET_INCLUDE_DIRECTORIES(mqtt-sngateway_common
.
${OS}
${OS}/${SENSORNET}
../../MQTTSNPacket/src
)
TARGET_LINK_LIBRARIES(mqtt-sngateway_common
PRIVATE
MQTTSNPacketClient
MQTTSNPacketServer
MQTTSNPacket
pthread
ssl
crypto)

View File

@@ -16,6 +16,8 @@
PROJECT(mqtt-sn-samples)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
INCLUDE_DIRECTORIES(../src)
ADD_EXECUTABLE(
@@ -23,39 +25,39 @@ ADD_EXECUTABLE(
qos0pub.c transport.c
)
TARGET_LINK_LIBRARIES(qos0pub MQTTSNPacketClient)
TARGET_LINK_LIBRARIES(qos0pub MQTTSNPacket)
ADD_EXECUTABLE(
qos0pub_register
qos0pub_register.c transport.c
)
TARGET_LINK_LIBRARIES(qos0pub_register MQTTSNPacketClient)
TARGET_LINK_LIBRARIES(qos0pub_register MQTTSNPacket)
ADD_EXECUTABLE(
qos-1pub
qos-1pub.c transport.c
)
TARGET_LINK_LIBRARIES(qos-1pub MQTTSNPacketClient)
TARGET_LINK_LIBRARIES(qos-1pub MQTTSNPacket)
ADD_EXECUTABLE(
qos-1pub_extended
qos-1pub_extended.c transport.c
)
TARGET_LINK_LIBRARIES(qos-1pub_extended MQTTSNPacketClient)
TARGET_LINK_LIBRARIES(qos-1pub_extended MQTTSNPacket)
ADD_EXECUTABLE(
qos1pub
qos1pub.c transport.c
)
TARGET_LINK_LIBRARIES(qos1pub MQTTSNPacketClient)
TARGET_LINK_LIBRARIES(qos1pub MQTTSNPacket)
ADD_EXECUTABLE(
pub0sub1
pub0sub1.c transport.c
)
TARGET_LINK_LIBRARIES(pub0sub1 MQTTSNPacketClient)
TARGET_LINK_LIBRARIES(pub0sub1 MQTTSNPacket)

View File

@@ -1,7 +0,0 @@
gcc -Wall -c transport.c -Os -s
gcc -Wall qos0pub.c transport.o -I ../src ../src/MQTTSNSerializePublish.c ../src/MQTTSNPacket.c ../src/MQTTSNConnectClient.c -o qos0pub -Os -s
gcc -Wall qos0pub_register.c transport.o -I ../src ../src/MQTTSNSerializePublish.c ../src/MQTTSNDeserializePublish.c ../src/MQTTSNPacket.c ../src/MQTTSNConnectClient.c -o qos0pub_register -Os -s
gcc -Wall qos-1pub.c transport.o -I ../src ../src/MQTTSNSerializePublish.c ../src/MQTTSNPacket.c -o qos-1pub -Os -s
gcc -Wall qos-1pub_extended.c transport.o -I ../src ../src/MQTTSNSerializePublish.c ../src/MQTTSNPacket.c -o qos-1pub_extended -Os -s
gcc -Wall qos1pub.c transport.o -I ../src ../src/MQTTSNSerializePublish.c ../src/MQTTSNDeserializePublish.c ../src/MQTTSNPacket.c ../src/MQTTSNConnectClient.c -o qos1pub -Os -s
gcc -Wall pub0sub1.c transport.o -I ../src ../src/MQTTSNSerializePublish.c ../src/MQTTSNDeserializePublish.c ../src/MQTTSNPacket.c ../src/MQTTSNConnectClient.c ../src/MQTTSNSubscribeClient.c -o pub0sub1 -Os -s

View File

@@ -17,11 +17,7 @@
PROJECT(mqtt-sn-packet C)
ADD_LIBRARY(MQTTSNPacketClient SHARED MQTTSNConnectClient.c MQTTSNPacket.c MQTTSNSearchClient.c MQTTSNSubscribeClient.c
MQTTSNUnsubscribeClient.c MQTTSNSerializePublish.c MQTTSNDeserializePublish.c)
ADD_LIBRARY(MQTTSNPacket SHARED MQTTSNConnectClient.c MQTTSNPacket.c MQTTSNSearchClient.c MQTTSNSubscribeClient.c
MQTTSNUnsubscribeClient.c MQTTSNSerializePublish.c MQTTSNDeserializePublish.c MQTTSNConnectServer.c MQTTSNPacket.c
MQTTSNSearchServer.c MQTTSNSubscribeServer.c MQTTSNUnsubscribeServer.c MQTTSNSerializePublish.c MQTTSNDeserializePublish.c)
ADD_LIBRARY(MQTTSNPacketServer SHARED MQTTSNConnectServer.c MQTTSNPacket.c MQTTSNSearchServer.c MQTTSNSubscribeServer.c
MQTTSNUnsubscribeServer.c MQTTSNSerializePublish.c MQTTSNDeserializePublish.c)
TARGET_INCLUDE_DIRECTORIES(MQTTSNPacketClient PUBLIC .)
TARGET_INCLUDE_DIRECTORIES(MQTTSNPacketServer PUBLIC .)

View File

@@ -16,6 +16,8 @@
PROJECT(mqtt-sn-tests)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
INCLUDE_DIRECTORIES(../src)
ADD_EXECUTABLE(
@@ -23,7 +25,7 @@ ADD_EXECUTABLE(
test1.c
)
TARGET_LINK_LIBRARIES(test1 MQTTSNPacketClient MQTTSNPacketServer)
TARGET_LINK_LIBRARIES(test1 MQTTSNPacket)
ADD_TEST(NAME test1 COMMAND test1)
@@ -32,4 +34,4 @@ ADD_EXECUTABLE(
test2.c
)
TARGET_LINK_LIBRARIES(test2 MQTTSNPacketClient MQTTSNPacketServer)
TARGET_LINK_LIBRARIES(test2 MQTTSNPacket)