From 2e6837e45d48a73920666001173e8340dea8a6e6 Mon Sep 17 00:00:00 2001 From: Nanosonde <2073569+nanosonde@users.noreply.github.com> Date: Thu, 3 Jan 2019 15:45:04 +0100 Subject: [PATCH] Fix CMakeLists.txt files --- port/knxPython/CMakeLists.txt | 61 ++++++++++++++++---------------- port/linux/CMakeLists.txt | 65 ++++++++++++++++++++--------------- 2 files changed, 68 insertions(+), 58 deletions(-) diff --git a/port/knxPython/CMakeLists.txt b/port/knxPython/CMakeLists.txt index 632b088..f68c7d0 100644 --- a/port/knxPython/CMakeLists.txt +++ b/port/knxPython/CMakeLists.txt @@ -3,35 +3,36 @@ project(knx) add_subdirectory(pybind11) -pybind11_add_module(knx \ - ../../src/knx/address_table_object.cpp \ - ../../src/knx/apdu.cpp \ - ../../src/knx/application_layer.cpp \ - ../../src/knx/application_program_object.cpp \ - ../../src/knx/association_table_object.cpp \ - ../../src/knx/bau.cpp \ - ../../src/knx/bau07B0.cpp \ - ../../src/knx/bau57B0.cpp \ - ../../src/knx/bau_systemB.cpp \ - ../../src/knx/bits.cpp \ - ../../src/knx/cemi_frame.cpp \ - ../../src/knx/datapoint_types.cpp \ - ../../src/knx/data_link_layer.cpp \ - ../../src/knx/device_object.cpp \ - ../../src/knx/group_object.cpp \ - ../../src/knx/group_object_table_object.cpp \ - ../../src/knx/interface_object.cpp \ - ../../src/knx/ip_data_link_layer.cpp \ - ../../src/knx/ip_parameter_object.cpp \ - ../../src/knx/memory.cpp \ - ../../src/knx/network_layer.cpp \ - ../../src/knx/npdu.cpp \ - ../../src/knx/platform.cpp \ - ../../src/knx/table_object.cpp \ - ../../src/knx/tpdu.cpp \ - ../../src/knx/tpuart_data_link_layer.cpp \ - ../../src/knx/transport_layer.cpp \ - ../../platform/linux/linux_platform.cpp \ +pybind11_add_module(knx + ../../src/knx/address_table_object.cpp + ../../src/knx/apdu.cpp + ../../src/knx/application_layer.cpp + ../../src/knx/application_program_object.cpp + ../../src/knx/association_table_object.cpp + ../../src/knx/bau.cpp + ../../src/knx/bau07B0.cpp + ../../src/knx/bau57B0.cpp + ../../src/knx/bau_systemB.cpp + ../../src/knx/bits.cpp + ../../src/knx/cemi_frame.cpp + ../../src/knx/datapoint_types.cpp + ../../src/knx/data_link_layer.cpp + ../../src/knx/device_object.cpp + ../../src/knx/group_object.cpp + ../../src/knx/group_object_table_object.cpp + ../../src/knx/interface_object.cpp + ../../src/knx/ip_data_link_layer.cpp + ../../src/knx/ip_parameter_object.cpp + ../../src/knx/memory.cpp + ../../src/knx/network_layer.cpp + ../../src/knx/npdu.cpp + ../../src/knx/platform.cpp + ../../src/knx/table_object.cpp + ../../src/knx/tpdu.cpp + ../../src/knx/tpuart_data_link_layer.cpp + ../../src/knx/transport_layer.cpp + ../../platform/linux/linux_platform.cpp knxmodule.cpp) -include_directories(../src pybind11/include) +include_directories(../../src ../../platform/linux pybind11/include) + diff --git a/port/linux/CMakeLists.txt b/port/linux/CMakeLists.txt index 2b878de..0bce7d9 100644 --- a/port/linux/CMakeLists.txt +++ b/port/linux/CMakeLists.txt @@ -2,36 +2,45 @@ cmake_minimum_required(VERSION 2.7) project(knx-linux) + set(LIBRARIES_FROM_REFERENCES "") -add_executable(knx-linux \ - ../../src/knx/address_table_object.cpp \ - ../../src/knx/apdu.cpp \ - ../../src/knx/application_layer.cpp \ - ../../src/knx/application_program_object.cpp \ - ../../src/knx/association_table_object.cpp \ - ../../src/knx/bau.cpp \ - ../../src/knx/bau07B0.cpp \ - ../../src/knx/bau57B0.cpp \ - ../../src/knx/bau_systemB.cpp \ - ../../src/knx/bits.cpp \ - ../../src/knx/cemi_frame.cpp \ - ../../src/knx/data_link_layer.cpp \ - ../../src/knx/datapoint_types.cpp \ - ../../src/knx/device_object.cpp \ - ../../src/knx/group_object.cpp \ - ../../src/knx/group_object_table_object.cpp \ - ../../src/knx/interface_object.cpp \ - ../../src/knx/ip_data_link_layer.cpp \ - ../../src/knx/ip_parameter_object.cpp \ - ../../src/knx/memory.cpp \ - ../../src/knx/network_layer.cpp \ - ../../src/knx/npdu.cpp \ - ../../src/knx/table_object.cpp \ - ../../src/knx/tpdu.cpp \ - ../../src/knx/tpuart_data_link_layer.cpp \ - ../../src/knx/transport_layer.cpp main.cpp \ - ../../platform/linux/linux_platform.cpp) + +add_executable(knx-linux + ../../src/knx/address_table_object.cpp + ../../src/knx/apdu.cpp + ../../src/knx/application_layer.cpp + ../../src/knx/application_program_object.cpp + ../../src/knx/association_table_object.cpp + ../../src/knx/bau.cpp + ../../src/knx/bau07B0.cpp + ../../src/knx/bau57B0.cpp + ../../src/knx/bau_systemB.cpp + ../../src/knx/bits.cpp + ../../src/knx/cemi_frame.cpp + ../../src/knx/data_link_layer.cpp + ../../src/knx/datapoint_types.cpp + ../../src/knx/device_object.cpp + ../../src/knx/group_object.cpp + ../../src/knx/group_object_table_object.cpp + ../../src/knx/interface_object.cpp + ../../src/knx/ip_data_link_layer.cpp + ../../src/knx/ip_parameter_object.cpp + ../../src/knx/memory.cpp + ../../src/knx/network_layer.cpp + ../../src/knx/npdu.cpp + ../../src/knx/table_object.cpp + ../../src/knx/tpdu.cpp + ../../src/knx/tpuart_data_link_layer.cpp + ../../src/knx/transport_layer.cpp + ../../src/knx/platform.cpp + ../../platform/linux/linux_platform.cpp + main.cpp) + target_link_libraries(knx-linux "${LIBRARIES_FROM_REFERENCES}") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -Wno-switch") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-unknown-pragmas -Wno-switch") + include_directories(/usr/include/x86_64-linux-gnu) +include_directories(../../src ../../platform/linux) +