[DEV] update Catkin
This commit is contained in:
parent
24af15748d
commit
488b44b03b
@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 2.8.3)
|
cmake_minimum_required(VERSION 2.8.3)
|
||||||
project(airtaudio)
|
project(audio_orchestra)
|
||||||
|
|
||||||
set(CMAKE_VERBOSE_MAKEFILE ON)
|
set(CMAKE_VERBOSE_MAKEFILE ON)
|
||||||
|
|
||||||
@ -42,24 +42,23 @@ include_directories(
|
|||||||
|
|
||||||
## Declare a cpp library
|
## Declare a cpp library
|
||||||
add_library(${PROJECT_NAME}
|
add_library(${PROJECT_NAME}
|
||||||
../${PROJECT_NAME}/debug.cpp
|
../audio/orchestra/debug.cpp
|
||||||
../${PROJECT_NAME}/status.cpp
|
../audio/orchestra/status.cpp
|
||||||
../${PROJECT_NAME}/type.cpp
|
../audio/orchestra/type.cpp
|
||||||
../${PROJECT_NAME}/mode.cpp
|
../audio/orchestra/mode.cpp
|
||||||
../${PROJECT_NAME}/state.cpp
|
../audio/orchestra/state.cpp
|
||||||
../${PROJECT_NAME}/error.cpp
|
../audio/orchestra/error.cpp
|
||||||
../${PROJECT_NAME}/base.cpp
|
../audio/orchestra/base.cpp
|
||||||
../${PROJECT_NAME}/Interface.cpp
|
../audio/orchestra/Interface.cpp
|
||||||
../${PROJECT_NAME}/Flags.cpp
|
../audio/orchestra/Flags.cpp
|
||||||
../${PROJECT_NAME}/Api.cpp
|
../audio/orchestra/Api.cpp
|
||||||
../${PROJECT_NAME}/DeviceInfo.cpp
|
../audio/orchestra/DeviceInfo.cpp
|
||||||
../${PROJECT_NAME}/StreamOptions.cpp
|
../audio/orchestra/StreamOptions.cpp
|
||||||
../${PROJECT_NAME}/api/Dummy.cpp
|
../audio/orchestra/api/Dummy.cpp
|
||||||
../${PROJECT_NAME}/api/Alsa.cpp
|
../audio/orchestra/api/Alsa.cpp
|
||||||
../${PROJECT_NAME}/api/Jack.cpp
|
../audio/orchestra/api/Jack.cpp
|
||||||
../${PROJECT_NAME}/api/Pulse.cpp
|
../audio/orchestra/api/Pulse.cpp
|
||||||
../${PROJECT_NAME}/api/Oss.cpp
|
../audio/orchestra/api/Oss.cpp
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_definitions(-D__LINUX_ALSA__)
|
add_definitions(-D__LINUX_ALSA__)
|
||||||
@ -86,7 +85,7 @@ install(TARGETS ${PROJECT_NAME}
|
|||||||
)
|
)
|
||||||
|
|
||||||
## Mark cpp header files for installation
|
## Mark cpp header files for installation
|
||||||
install(DIRECTORY ../${PROJECT_NAME}/
|
install(DIRECTORY ../audio/orchestra/
|
||||||
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
|
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
|
||||||
FILES_MATCHING PATTERN "*.h"
|
FILES_MATCHING PATTERN "*.h"
|
||||||
)
|
)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<package>
|
<package>
|
||||||
<name>airtaudio</name>
|
<name>audio_orchestra</name>
|
||||||
<version>0.3.0</version>
|
<version>0.3.0</version>
|
||||||
<description>Ewol RTAudio fork</description>
|
<description>Ewol RTAudio fork</description>
|
||||||
<maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
|
<maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user