Commit 833729cb authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼

added new VILLAScommon submodule

parent 708ea877
......@@ -10,7 +10,7 @@ insert_final_newline = true
# Matches multiple files with brace expansion notation
# Set default charset
[{etc,include,lib,plugins,src,tests,tools}/**.{c,h,proto,cpp}]
[{etc,include,lib,plugins,src,tests,tools,common}/**.{c,h,proto,cpp,hpp}]
charset = utf-8
indent_style = tab
indent_size = 8
......
[submodule "web/socket/flot"]
path = web/socket/flot
url = https://github.com/flot/flot.git
[submodule "common"]
path = common
url = ../VILLAScommon.git
......@@ -81,8 +81,7 @@ endif()
# Check packages
find_package(PkgConfig REQUIRED)
find_package(Threads REQUIRED)
find_package(OpenSSL 1.0.0 REQUIRED)
find_package(CURL 7.29 REQUIRED)
find_package(Libwebsockets 2.3.0 REQUIRED)
find_package(Mosquitto)
find_package(Opal)
find_package(IBVerbs)
......@@ -190,6 +189,7 @@ endif()
set(BUILDID "v${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}-${GIT_REV}-${VARIANT}")
add_subdirectory(common)
add_subdirectory(etc)
add_subdirectory(lib)
add_subdirectory(web)
......
Subproject commit 2c11256c3282f0ddea48244621f6b67d70aa9dd8
......@@ -24,16 +24,13 @@ add_compile_options(-fPIC)
list(APPEND INCLUDE_DIRS
${JANSSON_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIR}
${CURL_INCLUDE_DIRS}
${VILLASnode_BINARY_DIR}/include
${VILLASnode_SOURCE_DIR}/include
${PROJECT_BINARY_DIR}/include
${PROJECT_SOURCE_DIR}/include
)
set(LIBRARIES
PkgConfig::JANSSON
${OPENSSL_LIBRARIES}
${CURL_LIBRARIES}
villas-common
m
)
......@@ -129,7 +126,7 @@ endif()
add_library(villas SHARED ${LIB_SRC})
target_include_directories(villas PUBLIC ${INCLUDE_DIRS})
target_link_libraries(villas PUBLIC ${LIBRARIES})
target_link_libraries(villas PUBLIC ${LIBRARIES} villas-common)
if(APPLE)
target_link_libraries(villas PRIVATE -Wl,-all_load ${WHOLE_ARCHIVES} -Wl,-noall_load)
......
......@@ -36,4 +36,5 @@ set(API_SRC
add_library(api STATIC ${API_SRC})
target_include_directories(api PUBLIC ${INCLUDE_DIRS})
target_link_libraries(api INTERFACE ${LIBRARIES})
target_link_libraries(api INTERFACE ${LIBRARIES} PUBLIC villas-common)
......@@ -72,4 +72,4 @@ list(APPEND FORMAT_SRC
add_library(formats STATIC ${FORMAT_SRC})
target_include_directories(formats PUBLIC ${INCLUDE_DIRS})
target_link_libraries(formats INTERFACE ${LIBRARIES})
target_link_libraries(formats INTERFACE ${LIBRARIES} PUBLIC villas-common)
......@@ -44,4 +44,4 @@ endif()
add_library(hooks STATIC ${HOOK_SRC})
target_include_directories(hooks PUBLIC ${INCLUDE_DIRS})
target_link_libraries(hooks INTERFACE ${LIBRARIES})
target_link_libraries(hooks INTERFACE ${LIBRARIES} PUBLIC villas-common)
......@@ -29,7 +29,7 @@ set(NODE_SRC
if(LIBNL3_ROUTE_FOUND)
list(APPEND LIBRARIES PkgConfig::LIBNL3_ROUTE)
list(APPEND INCLUDE_DIRS LIBNL3_ROUTE_INCLUDE_DIRS)
list(APPEND INCLUDE_DIRS ${LIBNL3_ROUTE_INCLUDE_DIRS})
endif()
if(WITH_IO)
......@@ -127,4 +127,4 @@ endif()
add_library(nodes STATIC ${NODE_SRC})
target_include_directories(nodes PUBLIC ${INCLUDE_DIRS})
target_link_libraries(nodes LINK_PRIVATE ${LIBRARIES})
target_link_libraries(nodes INTERFACE ${LIBRARIES} PUBLIC villas-common)
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