mirror of
				https://github.com/thelsing/knx.git
				synced 2025-10-26 10:26:25 +01:00 
			
		
		
		
	Merge branch 'master' of https://github.com/thelsing/knx
This commit is contained in:
		
						commit
						e788047213
					
				@ -25,6 +25,7 @@
 | 
			
		||||
      install:
 | 
			
		||||
      
 | 
			
		||||
      script:
 | 
			
		||||
        - echo "building knx-linux"
 | 
			
		||||
        - cd examples/knx-linux
 | 
			
		||||
        - mkdir -p build
 | 
			
		||||
        - cd build
 | 
			
		||||
 | 
			
		||||
@ -2,7 +2,7 @@
 | 
			
		||||
#Note: VisualGDB will automatically update this file when you add new sources to the project.
 | 
			
		||||
 | 
			
		||||
cmake_minimum_required(VERSION 2.7)
 | 
			
		||||
#project(knx)
 | 
			
		||||
project(knx)
 | 
			
		||||
 | 
			
		||||
add_subdirectory(pybind11)
 | 
			
		||||
 | 
			
		||||
@ -41,6 +41,6 @@ pybind11_add_module(knx
 | 
			
		||||
	src/knx/dpt.cpp)
 | 
			
		||||
include_directories(src pybind11/include)
 | 
			
		||||
 | 
			
		||||
set(outdir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 | 
			
		||||
set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir})
 | 
			
		||||
#set(outdir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 | 
			
		||||
#set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir})
 | 
			
		||||
set_target_properties(knx PROPERTIES OUTPUT_NAME knx)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user