Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@thelsing
thelsing committed Aug 16, 2024
1 parent 74036ba commit 32bd812
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 167 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ project(knx VERSION 1.5)
add_subdirectory(src)
add_subdirectory(examples/knx-linux)
add_subdirectory(examples/knx-linux-coupler)
#add_subdirectory(examples/knxPython)
add_subdirectory(examples/knxPython)
64 changes: 32 additions & 32 deletions examples/knx-cc1310/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ find_package(SimpleLinkCC13X0SDKnortos REQUIRED)
set(${PROJECT_NAME}_SOURCES
../../src/knx/address_table_object.cpp
../../src/knx/address_table_object.h
../../src/knx/aes.c
../../src/knx/aes.h
../../src/knx/aes.hpp
../../src/knx/util/aes.c
../../src/knx/util/aes.h
../../src/knx/util/aes.hpp
../../src/knx/apdu.cpp
../../src/knx/apdu.h
../../src/knx/application_layer.cpp
Expand Down Expand Up @@ -94,26 +94,26 @@ set(${PROJECT_NAME}_SOURCES
../../src/knx/group_object_table_object.h
../../src/knx/interface_object.cpp
../../src/knx/interface_object.h
../../src/knx/ip_data_link_layer.cpp
../../src/knx/ip_data_link_layer.h
../../src/knx/ip_parameter_object.cpp
../../src/knx/ip_parameter_object.h
../../src/knx/knx_ip_device_information_dib.cpp
../../src/knx/knx_ip_device_information_dib.h
../../src/knx/knx_ip_dib.cpp
../../src/knx/knx_ip_dib.h
../../src/knx/knx_ip_frame.cpp
../../src/knx/knx_ip_frame.h
../../src/knx/knx_ip_routing_indication.cpp
../../src/knx/knx_ip_routing_indication.h
../../src/knx/knx_ip_search_request.cpp
../../src/knx/knx_ip_search_request.h
../../src/knx/knx_ip_search_response.cpp
../../src/knx/knx_ip_search_response.h
../../src/knx/knx_ip_supported_service_dib.cpp
../../src/knx/knx_ip_supported_service_dib.h
../../src/knx/ip_host_protocol_address_information.cpp
../../src/knx/ip_host_protocol_address_information.h
../../src/knx/ip/ip_data_link_layer.cpp
../../src/knx/ip/ip_data_link_layer.h
../../src/knx/ip/ip_parameter_object.cpp
../../src/knx/ip/ip_parameter_object.h
../../src/knx/ip/knx_ip_device_information_dib.cpp
../../src/knx/ip/knx_ip_device_information_dib.h
../../src/knx/ip/knx_ip_dib.cpp
../../src/knx/ip/knx_ip_dib.h
../../src/knx/ip/knx_ip_frame.cpp
../../src/knx/ip/knx_ip_frame.h
../../src/knx/ip/knx_ip_routing_indication.cpp
../../src/knx/ip/knx_ip_routing_indication.h
../../src/knx/ip/knx_ip_search_request.cpp
../../src/knx/ip/knx_ip_search_request.h
../../src/knx/ip/knx_ip_search_response.cpp
../../src/knx/ip/knx_ip_search_response.h
../../src/knx/ip/knx_ip_supported_service_dib.cpp
../../src/knx/ip/knx_ip_supported_service_dib.h
../../src/knx/ip/ip_host_protocol_address_information.cpp
../../src/knx/ip/ip_host_protocol_address_information.h
../../src/knx/knx_types.h
../../src/knx/knx_value.cpp
../../src/knx/knx_value.h
Expand All @@ -133,20 +133,20 @@ set(${PROJECT_NAME}_SOURCES
../../src/knx/platform.h
../../src/knx/property.cpp
../../src/knx/property.h
../../src/knx/rf_data_link_layer.cpp
../../src/knx/rf_data_link_layer.h
../../src/knx/rf_medium_object.cpp
../../src/knx/rf_medium_object.h
../../src/knx/rf_physical_layer_cc1310.cpp
../../src/knx/rf_physical_layer_cc1310.h
../../src/knx/rf_physical_layer.h
../../src/knx/rf/rf_data_link_layer.cpp
../../src/knx/rf/rf_data_link_layer.h
../../src/knx/rf/rf_medium_object.cpp
../../src/knx/rf/rf_medium_object.h
../../src/knx/rf/rf_physical_layer_cc1310.cpp
../../src/knx/rf/rf_physical_layer_cc1310.h
../../src/knx/rf/rf_physical_layer.h
../../src/knx/router_object.cpp
../../src/knx/router_object.h
../../src/knx/secure_application_layer.cpp
../../src/knx/secure_application_layer.h
../../src/knx/security_interface_object.cpp
../../src/knx/security_interface_object.h
../../src/knx/simple_map.h
../../src/knx/util/simple_map.h
../../src/knx/save_restore.h
../../src/knx/table_object.cpp
../../src/knx/table_object.h
Expand All @@ -160,7 +160,7 @@ set(${PROJECT_NAME}_SOURCES
../../src/knx/usb_tunnel_interface.h
../../src/knx_facade.cpp
../../src/knx_facade.h
../../src/cc1310_platform.cpp
../../src/knx/platform/cc1310_platform.cpp
../../src/knx_facade.cpp
./RTT/SEGGER_RTT_Conf.h
./RTT/SEGGER_RTT_printf.c
Expand Down
2 changes: 0 additions & 2 deletions examples/knx-linux-coupler/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ set(SOURCES
fdsk.h
main.cpp)

include_directories(../../src)

set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")

Expand Down
130 changes: 2 additions & 128 deletions examples/knxPython/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,138 +5,12 @@ add_subdirectory(pybind11)

pybind11_add_module(knxPython
knxmodule.cpp
../../src/knx/address_table_object.cpp
../../src/knx/address_table_object.h
../../src/knx/aes.c
../../src/knx/aes.h
../../src/knx/aes.hpp
../../src/knx/apdu.cpp
../../src/knx/apdu.h
../../src/knx/application_layer.cpp
../../src/knx/application_layer.h
../../src/knx/application_program_object.cpp
../../src/knx/application_program_object.h
../../src/knx/association_table_object.cpp
../../src/knx/association_table_object.h
../../src/knx/bau.cpp
../../src/knx/bau.h
../../src/knx/bau07B0.cpp
../../src/knx/bau07B0.h
../../src/knx/bau091A.cpp
../../src/knx/bau091A.h
../../src/knx/bau27B0.cpp
../../src/knx/bau27B0.h
../../src/knx/bau2920.cpp
../../src/knx/bau2920.h
../../src/knx/bau57B0.cpp
../../src/knx/bau57B0.h
../../src/knx/bau_systemB.cpp
../../src/knx/bau_systemB.h
../../src/knx/bau_systemB_device.cpp
../../src/knx/bau_systemB_device.h
../../src/knx/bau_systemB_coupler.cpp
../../src/knx/bau_systemB_coupler.h
../../src/knx/bits.cpp
../../src/knx/bits.h
../../src/knx/callback_property.h
../../src/knx/cemi_frame.cpp
../../src/knx/cemi_frame.h
../../src/knx/cemi_server.cpp
../../src/knx/cemi_server.h
../../src/knx/cemi_server_object.cpp
../../src/knx/cemi_server_object.h
../../src/knx/config.h
../../src/knx/data_link_layer.cpp
../../src/knx/data_link_layer.h
../../src/knx/data_property.cpp
../../src/knx/data_property.h
../../src/knx/device_object.cpp
../../src/knx/device_object.h
../../src/knx/dpt.cpp
../../src/knx/dpt.h
../../src/knx/dptconvert.cpp
../../src/knx/dptconvert.h
../../src/knx/function_property.h
../../src/knx/group_object.cpp
../../src/knx/group_object.h
../../src/knx/group_object_table_object.cpp
../../src/knx/group_object_table_object.h
../../src/knx/interface_object.cpp
../../src/knx/interface_object.h
../../src/knx/ip_data_link_layer.cpp
../../src/knx/ip_data_link_layer.h
../../src/knx/ip_parameter_object.cpp
../../src/knx/ip_parameter_object.h
../../src/knx/knx_ip_device_information_dib.cpp
../../src/knx/knx_ip_device_information_dib.h
../../src/knx/knx_ip_dib.cpp
../../src/knx/knx_ip_dib.h
../../src/knx/knx_ip_frame.cpp
../../src/knx/knx_ip_frame.h
../../src/knx/knx_ip_routing_indication.cpp
../../src/knx/knx_ip_routing_indication.h
../../src/knx/knx_ip_search_request.cpp
../../src/knx/knx_ip_search_request.h
../../src/knx/knx_ip_search_response.cpp
../../src/knx/knx_ip_search_response.h
../../src/knx/knx_ip_supported_service_dib.cpp
../../src/knx/knx_ip_supported_service_dib.h
../../src/knx/ip_host_protocol_address_information.cpp
../../src/knx/ip_host_protocol_address_information.h
../../src/knx/knx_types.h
../../src/knx/knx_value.cpp
../../src/knx/knx_value.h
../../src/knx/memory.cpp
../../src/knx/memory.h
../../src/knx/network_layer.cpp
../../src/knx/network_layer.h
../../src/knx/network_layer_coupler.cpp
../../src/knx/network_layer_coupler.h
../../src/knx/network_layer_device.cpp
../../src/knx/network_layer_device.h
../../src/knx/network_layer_entity.cpp
../../src/knx/network_layer_entity.h
../../src/knx/npdu.cpp
../../src/knx/npdu.h
../../src/knx/platform.cpp
../../src/knx/platform.h
../../src/knx/property.cpp
../../src/knx/property.h
../../src/knx/rf_data_link_layer.cpp
../../src/knx/rf_data_link_layer.h
../../src/knx/rf_medium_object.cpp
../../src/knx/rf_medium_object.h
../../src/knx/rf_physical_layer_cc1101.cpp
../../src/knx/rf_physical_layer_cc1101.h
../../src/knx/rf_physical_layer.h
../../src/knx/router_object.cpp
../../src/knx/router_object.h
../../src/knx/secure_application_layer.cpp
../../src/knx/secure_application_layer.h
../../src/knx/security_interface_object.cpp
../../src/knx/security_interface_object.h
../../src/knx/simple_map.h
../../src/knx/save_restore.h
../../src/knx/table_object.cpp
../../src/knx/table_object.h
../../src/knx/tpdu.cpp
../../src/knx/tpdu.h
../../src/knx/tpuart_data_link_layer.cpp
../../src/knx/tpuart_data_link_layer.h
../../src/knx/transport_layer.cpp
../../src/knx/transport_layer.h
../../src/knx/usb_tunnel_interface.cpp
../../src/knx/usb_tunnel_interface.h
../../src/knx_facade.cpp
../../src/knx_facade.h
../../src/linux_platform.cpp
../../src/linux_platform.h
)
include_directories(src pybind11/include)
include_directories(../../src)

#set(outdir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
#set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir})
set_target_properties(knxPython PROPERTIES OUTPUT_NAME knx)
set_property(TARGET knxPython PROPERTY CXX_STANDARD 11)
target_compile_definitions(knxPython PUBLIC -DMASK_VERSION=0x57B0)
#target_compile_definitions(knxPython PUBLIC -DMASK_VERSION=0x57B0)
target_link_libraries(knxPython PRIVATE knx)
5 changes: 3 additions & 2 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ knx_facade.h
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -g -O0")

add_library(knx ${SOURCES})
add_library(knx SHARED ${SOURCES})
target_include_directories(knx PUBLIC .)
set_property(TARGET knx PROPERTY CXX_STANDARD 11)
target_compile_definitions(knx PUBLIC -DUSE_RF -DUSE_USB -DUSE_TP -D_USE_IP -DUSE_CEMI_SERVER -DKNX_TUNNELING=1 -DUSE_DATASECURE -DALL_MASKS)
target_compile_definitions(knx PUBLIC -DUSE_RF -DUSE_USB -DUSE_TP -D_USE_IP -DUSE_CEMI_SERVER
-DKNX_TUNNELING=1 -DUSE_DATASECURE -DALL_MASKS)
2 changes: 1 addition & 1 deletion src/knx/rf/rf_physical_layer_cc1310.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <ti/drivers/rf/RF.h>
#include "smartrf_settings/smartrf_settings.h"

#include "cc1310_platform.h"
#include "../platform/cc1310_platform.h"
#include "Board.h"

#include "bits.h"
Expand Down
2 changes: 1 addition & 1 deletion src/knx/rf/rf_physical_layer_cc1310.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#ifdef DeviceFamily_CC13X0

#include "config.h"
#include "../config.h"

#include <stdint.h>

Expand Down

0 comments on commit 32bd812

Please sign in to comment.