Skip to content

Commit

Permalink
Re #7746. Create new LiveData package and move files into it.
Browse files Browse the repository at this point in the history
  • Loading branch information
RussellTaylor committed Aug 13, 2013
1 parent 61fa8da commit fa1bd07
Show file tree
Hide file tree
Showing 46 changed files with 101 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/DataHandling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ set ( TEST_FILES

if(UNITY_BUILD)
include(UnityBuild)
enable_unity_build(CurveFitting SRC_FILES SRC_UNITY_IGNORE_FILES 10)
enable_unity_build(DataHandling SRC_FILES SRC_UNITY_IGNORE_FILES 10)
endif(UNITY_BUILD)

# Use a precompiled header where they are supported
Expand Down
77 changes: 77 additions & 0 deletions Code/Mantid/Framework/LiveData/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
set ( SRC_FILES
src/ADARAPackets.cpp
src/ADARAParser.cpp
src/FakeEventDataListener.cpp
src/FakeISISHistoDAE.cpp
src/FileEventDataListener.cpp
src/ISISHistoDataListener.cpp
src/LiveDataAlgorithm.cpp
src/LoadDAE.cpp
src/LoadDAE/idc.cpp
src/LoadDAE/idc.h
src/LoadDAE/isisds_command.cpp
src/LoadDAE/isisds_command.h
src/LoadLiveData.cpp
src/MonitorLiveData.cpp
src/SNSLiveEventDataListener.cpp
src/StartLiveData.cpp
)

set ( SRC_UNITY_IGNORE_FILES src/LoadDAE/idc.cpp
src/LoadDAE/isisds_command.cpp)

set ( INC_FILES
inc/MantidDataHandling/ADARA.h
inc/MantidDataHandling/ADARAPackets.h
inc/MantidDataHandling/ADARAParser.h
inc/MantidDataHandling/FakeEventDataListener.h
inc/MantidDataHandling/FakeISISHistoDAE.h
inc/MantidDataHandling/FileEventDataListener.h
inc/MantidDataHandling/ISISHistoDataListener.h
inc/MantidDataHandling/LiveDataAlgorithm.h
inc/MantidDataHandling/LoadDAE.h
inc/MantidDataHandling/LoadLiveData.h
inc/MantidDataHandling/MonitorLiveData.h
inc/MantidDataHandling/SNSLiveEventDataListener.h
inc/MantidDataHandling/StartLiveData.h
)

set ( TEST_FILES
#Needs fixing to not rely on network. SNSLiveEventDataListenerTest.h
ADARAPacketTest.h
FakeEventDataListenerTest.h
FileEventDataListenerTest.h
ISISHistoDataListenerTest.h
LiveDataAlgorithmTest.h
LoadLiveDataTest.h
MonitorLiveDataTest.h
StartLiveDataTest.h
)


if(UNITY_BUILD)
include(UnityBuild)
enable_unity_build(LiveData SRC_FILES SRC_UNITY_IGNORE_FILES 10)
endif(UNITY_BUILD)

# Use a precompiled header where they are supported
enable_precompiled_headers( inc/MantidLiveData/PrecompiledHeader.h SRC_FILES )
# Add the target for this directory
add_library ( LiveData ${SRC_FILES} ${INC_FILES})
# Set the name of the generated library
set_target_properties ( LiveData PROPERTIES OUTPUT_NAME MantidLiveData )
# Add to the 'Framework' group in VS
set_property ( TARGET LiveData PROPERTY FOLDER "MantidFramework" )

include_directories ( inc )

target_link_libraries ( LiveData ${MANTIDLIBS} )

# Add the unit tests directory
add_subdirectory ( test )

###########################################################################
# Installation settings
###########################################################################

install ( TARGETS LiveData ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#ifndef MANTID_LIVEDATA_PRECOMPILEDHEADER_H_
#define MANTID_LIVEDATA_PRECOMPILEDHEADER_H_

// Algorithm
#include "MantidAPI/Algorithm.h"

#endif // MANTID_LIVEDATA_PRECOMPILEDHEADER_H_
16 changes: 16 additions & 0 deletions Code/Mantid/Framework/LiveData/test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
if ( CXXTEST_FOUND )
include_directories ( SYSTEM ${CXXTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} )

include_directories ( ../../TestHelpers/inc )
# This variable is used within the cxxtest_add_test macro to build this helper class into the test executable.
# It will go out of scope at the end of this file so doesn't need un-setting
set ( TESTHELPER_SRCS TestDataListener.cpp
)

cxxtest_add_test ( LiveDataTest ${TEST_FILES} )
target_link_libraries( LiveDataTest LiveData )
add_dependencies ( FrameworkTests LiveDataTest )
# Add to the 'FrameworkTests' group in VS
set_property ( TARGET LiveDataTest PROPERTY FOLDER "UnitTests" )
endif ()

0 comments on commit fa1bd07

Please sign in to comment.