Commit 7a1a68e8 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Merge branch 'master' into develop

parents 1f61b7a6 296a284f
......@@ -28,4 +28,4 @@ vista_configure_app( ita_whad )
vista_install( ita_whad )
vista_create_default_info_file( ita_whad )
set_property( TARGET ita_whad PROPERTY FOLDER "ITAApps/ITADataSources" )
set_property( TARGET ita_whad PROPERTY FOLDER "ITACoreLibs/Apps/ITADataSources" )
......@@ -28,7 +28,7 @@ vista_configure_app( BufferDataSourceTest )
vista_install( BufferDataSourceTest )
vista_create_default_info_file( BufferDataSourceTest )
set_property( TARGET BufferDataSourceTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET BufferDataSourceTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( FileDataSourceTest FileDataSourceTest.cpp )
......@@ -38,7 +38,7 @@ vista_configure_app( FileDataSourceTest )
vista_install( FileDataSourceTest )
vista_create_default_info_file( FileDataSourceTest )
set_property( TARGET FileDataSourceTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET FileDataSourceTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( DatasourceUtilsTest DatasourceUtilsTest.cpp )
......@@ -48,7 +48,7 @@ vista_configure_app( DatasourceUtilsTest )
vista_install( DatasourceUtilsTest )
vista_create_default_info_file( DatasourceUtilsTest )
set_property( TARGET DatasourceUtilsTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET DatasourceUtilsTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
# add_executable( FilterTest FilterTest.cpp )
......@@ -58,7 +58,7 @@ set_property( TARGET DatasourceUtilsTest PROPERTY FOLDER "ITATests/ITADataSource
# vista_install( FilterTest )
# vista_create_default_info_file( FilterTest )
# set_property( TARGET FilterTest PROPERTY FOLDER "ITATests/ITADataSources" )
# set_property( TARGET FilterTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
# add_executable( Patchbay1Test Patchbay1Test.cpp )
......@@ -68,7 +68,7 @@ set_property( TARGET DatasourceUtilsTest PROPERTY FOLDER "ITATests/ITADataSource
# vista_install( Patchbay1Test )
# vista_create_default_info_file( Patchbay1Test )
# set_property( TARGET Patchbay1Test PROPERTY FOLDER "ITATests/ITADataSources" )
# set_property( TARGET Patchbay1Test PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( PeakDetectorTest PeakDetectorTest.cpp )
......@@ -78,7 +78,7 @@ vista_configure_app( PeakDetectorTest )
vista_install( PeakDetectorTest )
vista_create_default_info_file( PeakDetectorTest )
set_property( TARGET PeakDetectorTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET PeakDetectorTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( StreamFunctionGeneratorTest StreamFunctionGeneratorTest.cpp )
......@@ -88,7 +88,7 @@ vista_configure_app( StreamFunctionGeneratorTest )
vista_install( StreamFunctionGeneratorTest )
vista_create_default_info_file( StreamFunctionGeneratorTest )
set_property( TARGET StreamFunctionGeneratorTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET StreamFunctionGeneratorTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( StreamPatchbayTest StreamPatchbayTest.cpp )
......@@ -98,7 +98,7 @@ vista_configure_app( StreamPatchbayTest )
vista_install( StreamPatchbayTest )
vista_create_default_info_file( StreamPatchbayTest )
set_property( TARGET StreamPatchbayTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET StreamPatchbayTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( StreamProbeTest StreamProbeTest.cpp )
......@@ -108,7 +108,7 @@ vista_configure_app( StreamProbeTest )
vista_install( StreamProbeTest )
vista_create_default_info_file( StreamProbeTest )
set_property( TARGET StreamProbeTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET StreamProbeTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
# add_executable( YJunctionTest YJunctionTest.cpp )
......@@ -118,7 +118,7 @@ set_property( TARGET StreamProbeTest PROPERTY FOLDER "ITATests/ITADataSources" )
# vista_install( YJunctionTest )
# vista_create_default_info_file( YJunctionTest )
# set_property( TARGET YJunctionTest PROPERTY FOLDER "ITATests/ITADataSources" )
# set_property( TARGET YJunctionTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
# Portaudio tests
......
......@@ -20,7 +20,7 @@ vista_configure_app( ListDevices )
vista_install( ListDevices )
vista_create_default_info_file( ListDevices )
set_property( TARGET ListDevices PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ListDevices PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( Loopback Loopback.cpp )
......@@ -30,7 +30,7 @@ vista_configure_app( Loopback )
vista_install( Loopback )
vista_create_default_info_file( Loopback )
set_property( TARGET Loopback PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET Loopback PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( Play Play.cpp )
......@@ -40,7 +40,7 @@ vista_configure_app( Play )
vista_install( Play )
vista_create_default_info_file( Play )
set_property( TARGET Play PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET Play PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( Record Record.cpp )
......@@ -50,7 +50,7 @@ vista_configure_app( Record )
vista_install( Record )
vista_create_default_info_file( Record )
set_property( TARGET Record PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET Record PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( ThreadInit ThreadInit.cpp )
......@@ -60,5 +60,5 @@ vista_configure_app( ThreadInit )
vista_install( ThreadInit )
vista_create_default_info_file( ThreadInit )
set_property( TARGET ThreadInit PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ThreadInit PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
......@@ -20,7 +20,7 @@ vista_configure_app( ITAPortaudioInterfaceRecorder )
vista_install( ITAPortaudioInterfaceRecorder )
vista_create_default_info_file( ITAPortaudioInterfaceRecorder )
set_property( TARGET ITAPortaudioInterfaceRecorder PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ITAPortaudioInterfaceRecorder PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( ITAPortaudioInterfaceTest ITAPortaudioInterfaceTest.cpp )
......@@ -30,7 +30,7 @@ vista_configure_app( ITAPortaudioInterfaceTest )
vista_install( ITAPortaudioInterfaceTest )
vista_create_default_info_file( ITAPortaudioInterfaceTest )
set_property( TARGET ITAPortaudioInterfaceTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ITAPortaudioInterfaceTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( ITAPortaudioMeasurementTest ITAPortaudioMeasurementTest.cpp )
......@@ -42,4 +42,4 @@ vista_configure_app( ITAPortaudioMeasurementTest )
vista_install( ITAPortaudioMeasurementTest )
vista_create_default_info_file( ITAPortaudioMeasurementTest )
set_property( TARGET ITAPortaudioMeasurementTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ITAPortaudioMeasurementTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
......@@ -19,7 +19,7 @@ vista_configure_app( ITAVistaNetTest )
vista_install( ITAVistaNetTest )
vista_create_default_info_file( ITAVistaNetTest )
set_property( TARGET ITAVistaNetTest PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ITAVistaNetTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( ITAVistaNetClient VistaNetClient.cpp )
......@@ -31,7 +31,7 @@ vista_configure_app( ITAVistaNetClient )
vista_install( ITAVistaNetClient )
vista_create_default_info_file( ITAVistaNetClient )
set_property( TARGET ITAVistaNetClient PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ITAVistaNetClient PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
add_executable( ITAVistaNetServer VistaNetServer.cpp )
......@@ -43,5 +43,5 @@ vista_configure_app( ITAVistaNetServer )
vista_install( ITAVistaNetServer )
vista_create_default_info_file( ITAVistaNetServer )
set_property( TARGET ITAVistaNetServer PROPERTY FOLDER "ITATests/ITADataSources" )
set_property( TARGET ITAVistaNetServer PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources" )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment