Merge branch 'master' into mqtt_client
This commit is contained in:
@@ -14,6 +14,7 @@ Create imported targets:
|
||||
* PIP::Lua
|
||||
* PIP::HTTPClient
|
||||
* PIP::HTTPServer
|
||||
* PIP::MQTTClient
|
||||
|
||||
These targets include directories and depends on
|
||||
main library
|
||||
@@ -25,10 +26,10 @@ include(SHSTKMacros)
|
||||
|
||||
shstk_set_find_dirs(PIP)
|
||||
|
||||
set(__libs "usb;crypt;console;fftw;compress;opencl;io_utils;client_server;cloud;lua;http_client;http_server")
|
||||
set(__libs "usb;crypt;console;fftw;compress;opencl;io_utils;client_server;cloud;lua;http_client;http_server;mqtt_client")
|
||||
|
||||
if (BUILDING_PIP)
|
||||
#set(_libs "pip;pip_usb;pip_console;pip_crypt;pip_fftw;pip_compress;pip_opencl;pip_io_utils;pip_cloud;pip_lua;pip_http_client;pip_http_server")
|
||||
#set(_libs "pip;pip_usb;pip_console;pip_crypt;pip_fftw;pip_compress;pip_opencl;pip_io_utils;pip_cloud;pip_lua;pip_http_client;pip_http_server;pip_mqtt_client")
|
||||
#set(_bins "pip_cmg;pip_rc;deploy_tool")
|
||||
#get_target_property(_path pip BINARY_DIR)
|
||||
#get_target_property(_path pip LIBRARY_OUTPUT_NAME)
|
||||
@@ -100,6 +101,7 @@ set(__module_cloud Cloud )
|
||||
set(__module_lua Lua )
|
||||
set(__module_http_client HTTPClient )
|
||||
set(__module_http_server HTTPServer )
|
||||
set(__module_mqtt_client MQTTClient )
|
||||
|
||||
foreach (_l ${__libs})
|
||||
set( __inc_${_l} "")
|
||||
|
||||
Reference in New Issue
Block a user