Fix compilation of 3P deps.

This commit is contained in:
jbnadal
2017-06-06 17:30:50 +02:00
parent 588d8a8633
commit 5ca048e846
3 changed files with 42 additions and 42 deletions

View File

@@ -10,35 +10,35 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}")
set(DISABLE_TARGET_OPTIMIZATION ON) set(DISABLE_TARGET_OPTIMIZATION ON)
include (aw) include (br)
file ( file (
GLOB_RECURSE GLOB_RECURSE
source_files source_files
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/main.c $ENV{SRC_DIR}/src/3P/netifd/main.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/utils.c $ENV{SRC_DIR}/src/3P/netifd/utils.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/system.c $ENV{SRC_DIR}/src/3P/netifd/system.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/tunnel.c $ENV{SRC_DIR}/src/3P/netifd/tunnel.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/handler.c $ENV{SRC_DIR}/src/3P/netifd/handler.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/interface.c $ENV{SRC_DIR}/src/3P/netifd/interface.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/interface-ip.c $ENV{SRC_DIR}/src/3P/netifd/interface-ip.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/interface-event.c $ENV{SRC_DIR}/src/3P/netifd/interface-event.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/iprule.c $ENV{SRC_DIR}/src/3P/netifd/iprule.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/proto.c $ENV{SRC_DIR}/src/3P/netifd/proto.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/proto-static.c $ENV{SRC_DIR}/src/3P/netifd/proto-static.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/proto-shell.c $ENV{SRC_DIR}/src/3P/netifd/proto-shell.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/config.c $ENV{SRC_DIR}/src/3P/netifd/config.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/device.c $ENV{SRC_DIR}/src/3P/netifd/device.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/bridge.c $ENV{SRC_DIR}/src/3P/netifd/bridge.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/vlan.c $ENV{SRC_DIR}/src/3P/netifd/vlan.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/alias.c $ENV{SRC_DIR}/src/3P/netifd/alias.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/macvlan.c $ENV{SRC_DIR}/src/3P/netifd/macvlan.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/ubus.c $ENV{SRC_DIR}/src/3P/netifd/ubus.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/vlandev.c $ENV{SRC_DIR}/src/3P/netifd/vlandev.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/wireless.c $ENV{SRC_DIR}/src/3P/netifd/wireless.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/system-linux.c $ENV{SRC_DIR}/src/3P/netifd/system-linux.c
) )

View File

@@ -13,28 +13,28 @@ include (br)
# Logd # Logd
add_executable (logd add_executable (logd
$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/logd.c $ENV{SRC_DIR}/src/3P/ubox/log/logd.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/syslog.c) $ENV{SRC_DIR}/src/3P/ubox/log/syslog.c)
target_link_libraries (logd ubox ubus) target_link_libraries (logd ubox ubus)
install (TARGETS logd RUNTIME DESTINATION sbin) install (TARGETS logd RUNTIME DESTINATION sbin)
# Logread # Logread
add_executable (logread add_executable (logread
$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/logread.c) $ENV{SRC_DIR}/src/3P/ubox/log/logread.c)
target_link_libraries (logread ubox ubus json-c blobmsg_json) target_link_libraries (logread ubox ubus json-c blobmsg_json)
install (TARGETS logread RUNTIME DESTINATION sbin) install (TARGETS logread RUNTIME DESTINATION sbin)
# kmodloader # kmodloader
add_executable (kmodloader add_executable (kmodloader
$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/kmodloader.c) $ENV{SRC_DIR}/src/3P/ubox/kmodloader.c)
target_link_libraries (kmodloader ubox) target_link_libraries (kmodloader ubox)
install (TARGETS kmodloader RUNTIME DESTINATION ../sbin) install (TARGETS kmodloader RUNTIME DESTINATION ../sbin)
# validate_data # validate_data
add_executable (validate_data add_executable (validate_data
$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/validate/cli.c $ENV{SRC_DIR}/src/3P/ubox/validate/cli.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/validate/validate.c) $ENV{SRC_DIR}/src/3P/ubox/validate/validate.c)
target_link_libraries (validate_data ubox uci) target_link_libraries (validate_data ubox uci)
install (TARGETS validate_data RUNTIME DESTINATION ../sbin) install (TARGETS validate_data RUNTIME DESTINATION ../sbin)

View File

@@ -6,25 +6,25 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}")
set(DISABLE_TARGET_OPTIMIZATION ON) set(DISABLE_TARGET_OPTIMIZATION ON)
include (aw) include (br)
include_directories ($ENV{AWOXCVS}/AwoxAudio/Products/External/uci) include_directories ($ENV{SRC_DIR}/src/3P/uci)
ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations) ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations)
CONFIGURE_FILE ($ENV{AWOXCVS}/AwoxAudio/Products/External/uci/uci_config.h.in $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/uci_config.h ) CONFIGURE_FILE ($ENV{SRC_DIR}/src/3P/uci/uci_config.h.in $ENV{SRC_DIR}/src/3P/uci/uci_config.h)
# uci library # uci library
file ( file (
GLOB_RECURSE GLOB_RECURSE
lib_source_files lib_source_files
$ENV{AWOXCVS}/AwoxAudio/Products/External/uci/libuci.c $ENV{SRC_DIR}/src/3P/uci/libuci.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/uci/file.c $ENV{SRC_DIR}/src/3P/uci/file.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/uci/util.c $ENV{SRC_DIR}/src/3P/uci/util.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/uci/delta.c $ENV{SRC_DIR}/src/3P/uci/delta.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/uci/parse.c $ENV{SRC_DIR}/src/3P/uci/parse.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/uci/blob.c $ENV{SRC_DIR}/src/3P/uci/blob.c
) )
# Library # Library
@@ -35,13 +35,13 @@ target_include_directories (uci PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
install (TARGETS uci LIBRARY DESTINATION local/lib) install (TARGETS uci LIBRARY DESTINATION local/lib)
file (GLOB uci_headers $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/*.h) file (GLOB uci_headers $ENV{SRC_DIR}/src/3P/uci/*.h)
install (FILES ${uci_headers} DESTINATION include/uci) install (FILES ${uci_headers} DESTINATION include/uci/)
# cmd line tool. # cmd line tool.
add_executable (uci_cli $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/cli.c) add_executable (uci_cli $ENV{SRC_DIR}/src/3P/uci/cli.c)
set_target_properties (uci_cli PROPERTIES OUTPUT_NAME uci) set_target_properties (uci_cli PROPERTIES OUTPUT_NAME uci)
target_link_libraries (uci_cli LINK_PUBLIC uci ubox blobmsg_json) target_link_libraries (uci_cli LINK_PUBLIC uci ubox blobmsg_json)
install (TARGETS uci_cli RUNTIME DESTINATION ../sbin) install (TARGETS uci_cli RUNTIME DESTINATION ../sbin)