Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit 6229245d authored by Georg Vinogradov's avatar Georg Vinogradov
Browse files

Modify CMakeLists.ftl

parent d07b9b9b
Pipeline #178014 failed with stages
in 1 minute and 1 second
......@@ -13,9 +13,7 @@ set(CMAKE_CXX_FLAGS "<#noparse>${CMAKE_CXX_FLAGS}</#noparse> -std=c++11 -pthread
# Setting project name and description
project(${model.getCompName()})
set(SEARCH_MQTT FALSE)
SET(CMAKE_MODULE_PATH "<#noparse>${CMAKE_CURRENT_LIST_DIR}</#noparse>/modules")
list(APPEND CMAKE_MODULE_PATH <#noparse>${CMAKE_CURRENT_SOURCE_DIR}</#noparse>/modules)
# Check is environment variable was set
IF(DEFINED ENV{MQTT_INCLUDE_DIR} AND DEFINED ENV{MQTT_LIBS})
......@@ -59,10 +57,10 @@ if(SEARCH_MQTT)
endif()
# Adding include directory to a target
target_include_directories(MqttAdapter_${model.getEscapedCompName()} PUBLIC <#noparse>${MQTT_INCLUDE_DIR}</#noparse>)
target_include_directories(MqttAdapter_${model.getEscapedCompName()} PUBLIC <#noparse>${LIBRARIES} ${MQTT_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}</#noparse>)
# Linking libraries to target
target_link_libraries(MqttAdapter_${model.getEscapedCompName()} PUBLIC <#noparse>${MQTT_LIBS}</#noparse>)
target_link_libraries(MqttAdapter_${model.getEscapedCompName()} PUBLIC <#noparse>${LIBRARIES} ${MQTT_LIBS}</#noparse>)
# Export target to a cmake module file for outside usage
export(TARGETS MqttAdapter_${model.getEscapedCompName()} FILE MQTTAdapter_${model.getEscapedCompName()}.cmake)
......@@ -37,14 +37,14 @@ public class AdapterGenerationTest extends AbstractSymtabTest {
componentInstanceSymbol.getPortInstance("portB").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clock"));
componentInstanceSymbol.getPortInstance("portC").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clock"));
componentInstanceSymbol.getPortInstance("portD").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clock"));
componentInstanceSymbol.getPortInstance("portE").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockN"));
componentInstanceSymbol.getPortInstance("portF").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockN"));
componentInstanceSymbol.getPortInstance("portG").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockZ"));
componentInstanceSymbol.getPortInstance("portH").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockZ"));
componentInstanceSymbol.getPortInstance("portI").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockB"));
componentInstanceSymbol.getPortInstance("portJ").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockB"));
List<File> files = generatorMqtt.generateMqttAdapter(componentInstanceSymbol);
componentInstanceSymbol.getPortInstance("portE").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockN"));
componentInstanceSymbol.getPortInstance("portF").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockN"));
componentInstanceSymbol.getPortInstance("portG").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockZ"));
componentInstanceSymbol.getPortInstance("portH").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockZ"));
componentInstanceSymbol.getPortInstance("portI").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockB"));
componentInstanceSymbol.getPortInstance("portJ").orElse(null).setMiddlewareSymbol(new MqttConnectionSymbol("/clockB"));
List<File> files = generatorMqtt.generateMqttAdapter(componentInstanceSymbol);
testFilesAreEqual(files, "echoAdapter/");
}
......
......@@ -11,9 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread")
# Setting project name and description
project(tests.a.compA)
set(SEARCH_MQTT FALSE)
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/modules)
# Check is environment variable was set
IF(DEFINED ENV{MQTT_INCLUDE_DIR} AND DEFINED ENV{MQTT_LIBS})
......@@ -57,10 +55,10 @@ if(SEARCH_MQTT)
endif()
# Adding include directory to a target
target_include_directories(MqttAdapter_tests_a_compA PUBLIC ${MQTT_INCLUDE_DIR})
target_include_directories(MqttAdapter_tests_a_compA PUBLIC ${LIBRARIES} ${MQTT_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
# Linking libraries to target
target_link_libraries(MqttAdapter_tests_a_compA PUBLIC ${MQTT_LIBS})
target_link_libraries(MqttAdapter_tests_a_compA PUBLIC ${LIBRARIES} ${MQTT_LIBS})
# Export target to a cmake module file for outside usage
export(TARGETS MqttAdapter_tests_a_compA FILE MQTTAdapter_tests_a_compA.cmake)
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