mirror of
https://github.com/thelsing/knx.git
synced 2024-12-18 19:08:18 +01:00
Merge branch 'master' into openknx-merge
This commit is contained in:
commit
2b11ecc4e1
@ -1,3 +1,7 @@
|
||||
cmake_policy(SET CMP0048 NEW)
|
||||
project(knx VERSION 1.4)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
add_subdirectory(examples/knx-linux)
|
||||
add_subdirectory(examples/knx-linux-coupler)
|
||||
add_subdirectory(examples/knxPython)
|
||||
add_subdirectory(examples/knxPython)
|
||||
|
@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 2.7)
|
||||
project(knx-linux-coupler)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
project(knx-linux-coupler VERSION 1.4)
|
||||
set(LIBRARIES_FROM_REFERENCES "")
|
||||
|
||||
set(SOURCES
|
||||
|
@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 2.7)
|
||||
project(knx-linux)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
project(knx-linux VERSION 1.4)
|
||||
set(LIBRARIES_FROM_REFERENCES "")
|
||||
|
||||
set(SOURCES
|
||||
|
@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 2.7)
|
||||
project(knx)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
project(knx VERSION 1.4)
|
||||
|
||||
add_subdirectory(pybind11)
|
||||
|
||||
@ -139,4 +139,4 @@ include_directories(../../src)
|
||||
#set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir})
|
||||
set_target_properties(knx PROPERTIES OUTPUT_NAME knx)
|
||||
set_property(TARGET knx PROPERTY CXX_STANDARD 11)
|
||||
target_compile_definitions(knx PUBLIC -DMASK_VERSION=0x57B0)
|
||||
target_compile_definitions(knx PUBLIC -DMASK_VERSION=0x57B0)
|
||||
|
Loading…
Reference in New Issue
Block a user