From 5ca048e846032b091b621adbecf2a9febb55a1ab Mon Sep 17 00:00:00 2001 From: jbnadal Date: Tue, 6 Jun 2017 17:30:50 +0200 Subject: [PATCH] Fix compilation of 3P deps. --- src/3P/netifd/builders/cmake/CMakeLists.txt | 46 ++++++++++----------- src/3P/ubox/builders/cmake/CMakeLists.txt | 12 +++--- src/3P/uci/builders/cmake/CMakeLists.txt | 26 ++++++------ 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/3P/netifd/builders/cmake/CMakeLists.txt b/src/3P/netifd/builders/cmake/CMakeLists.txt index eefb8126..a2617f3c 100644 --- a/src/3P/netifd/builders/cmake/CMakeLists.txt +++ b/src/3P/netifd/builders/cmake/CMakeLists.txt @@ -10,35 +10,35 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}") set(DISABLE_TARGET_OPTIMIZATION ON) -include (aw) +include (br) file ( GLOB_RECURSE source_files - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/main.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/utils.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/system.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/tunnel.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/handler.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/interface.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/interface-ip.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/interface-event.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/iprule.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/proto.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/proto-static.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/proto-shell.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/config.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/device.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/bridge.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/vlan.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/alias.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/macvlan.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/ubus.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/vlandev.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/netifd/wireless.c + $ENV{SRC_DIR}/src/3P/netifd/main.c + $ENV{SRC_DIR}/src/3P/netifd/utils.c + $ENV{SRC_DIR}/src/3P/netifd/system.c + $ENV{SRC_DIR}/src/3P/netifd/tunnel.c + $ENV{SRC_DIR}/src/3P/netifd/handler.c + $ENV{SRC_DIR}/src/3P/netifd/interface.c + $ENV{SRC_DIR}/src/3P/netifd/interface-ip.c + $ENV{SRC_DIR}/src/3P/netifd/interface-event.c + $ENV{SRC_DIR}/src/3P/netifd/iprule.c + $ENV{SRC_DIR}/src/3P/netifd/proto.c + $ENV{SRC_DIR}/src/3P/netifd/proto-static.c + $ENV{SRC_DIR}/src/3P/netifd/proto-shell.c + $ENV{SRC_DIR}/src/3P/netifd/config.c + $ENV{SRC_DIR}/src/3P/netifd/device.c + $ENV{SRC_DIR}/src/3P/netifd/bridge.c + $ENV{SRC_DIR}/src/3P/netifd/vlan.c + $ENV{SRC_DIR}/src/3P/netifd/alias.c + $ENV{SRC_DIR}/src/3P/netifd/macvlan.c + $ENV{SRC_DIR}/src/3P/netifd/ubus.c + $ENV{SRC_DIR}/src/3P/netifd/vlandev.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 ) diff --git a/src/3P/ubox/builders/cmake/CMakeLists.txt b/src/3P/ubox/builders/cmake/CMakeLists.txt index 37250946..5e18508e 100644 --- a/src/3P/ubox/builders/cmake/CMakeLists.txt +++ b/src/3P/ubox/builders/cmake/CMakeLists.txt @@ -13,28 +13,28 @@ include (br) # Logd add_executable (logd - $ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/logd.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/log/syslog.c) + $ENV{SRC_DIR}/src/3P/ubox/log/logd.c + $ENV{SRC_DIR}/src/3P/ubox/log/syslog.c) target_link_libraries (logd ubox ubus) install (TARGETS logd RUNTIME DESTINATION sbin) # 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) install (TARGETS logread RUNTIME DESTINATION sbin) # 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) install (TARGETS kmodloader RUNTIME DESTINATION ../sbin) # validate_data add_executable (validate_data - $ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/validate/cli.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/ubox/validate/validate.c) + $ENV{SRC_DIR}/src/3P/ubox/validate/cli.c + $ENV{SRC_DIR}/src/3P/ubox/validate/validate.c) target_link_libraries (validate_data ubox uci) install (TARGETS validate_data RUNTIME DESTINATION ../sbin) diff --git a/src/3P/uci/builders/cmake/CMakeLists.txt b/src/3P/uci/builders/cmake/CMakeLists.txt index bfa8eff1..3163f645 100644 --- a/src/3P/uci/builders/cmake/CMakeLists.txt +++ b/src/3P/uci/builders/cmake/CMakeLists.txt @@ -6,25 +6,25 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}") 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) -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 file ( GLOB_RECURSE lib_source_files - $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/libuci.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/file.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/util.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/delta.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/parse.c - $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/blob.c + $ENV{SRC_DIR}/src/3P/uci/libuci.c + $ENV{SRC_DIR}/src/3P/uci/file.c + $ENV{SRC_DIR}/src/3P/uci/util.c + $ENV{SRC_DIR}/src/3P/uci/delta.c + $ENV{SRC_DIR}/src/3P/uci/parse.c + $ENV{SRC_DIR}/src/3P/uci/blob.c ) # Library @@ -35,13 +35,13 @@ target_include_directories (uci PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) install (TARGETS uci LIBRARY DESTINATION local/lib) -file (GLOB uci_headers $ENV{AWOXCVS}/AwoxAudio/Products/External/uci/*.h) -install (FILES ${uci_headers} DESTINATION include/uci) +file (GLOB uci_headers $ENV{SRC_DIR}/src/3P/uci/*.h) +install (FILES ${uci_headers} DESTINATION include/uci/) # 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) target_link_libraries (uci_cli LINK_PUBLIC uci ubox blobmsg_json) -install (TARGETS uci_cli RUNTIME DESTINATION ../sbin) \ No newline at end of file +install (TARGETS uci_cli RUNTIME DESTINATION ../sbin)