Skip to content

Commit

Permalink
Added a directories and cmakelists for ISISLiveData library. Re #7719
Browse files Browse the repository at this point in the history
  • Loading branch information
mantid-roman committed Aug 9, 2013
1 parent 256742b commit df1a236
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Code/Mantid/Framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ add_subdirectory (MDAlgorithms)
add_subdirectory (MDEvents)
add_subdirectory (Doxygen)
add_subdirectory (ScriptRepository)
add_subdirectory (ISISLiveData)

###########################################################################
# Add a custom target to build all of the Framework
Expand All @@ -149,6 +150,7 @@ set ( FRAMEWORK_LIBS Kernel Geometry API PythonAPI PythonKernelModule
PythonGeometryModule PythonAPIModule DataObjects
DataHandling Nexus Algorithms CurveFitting ICat
Crystal MDAlgorithms MDEvents WorkflowAlgorithms
ISISLiveData
)

add_custom_target( Framework DEPENDS ${FRAMEWORK_LIBS} )
Expand Down
35 changes: 35 additions & 0 deletions Code/Mantid/Framework/ISISLiveData/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
set ( SRC_FILES
)

set ( INC_FILES
inc/MantidISISLiveData/DllConfig.h
)

set ( TEST_FILES
)


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

include_directories ( inc )

target_link_libraries ( ISISLiveData ${MANTIDLIBS} )

# Add the unit tests directory
add_subdirectory ( test )

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

install ( TARGETS ISISLiveData ${SYSTEM_PACKAGE_TARGET} DESTINATION ${PLUGINS_DIR} )


Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#ifndef MANTID_ISISLIVEDATA_DLLCONFIG_H_
#define MANTID_ISISLIVEDATA_DLLCONFIG_H_

/*
This file contains the DLLExport/DLLImport linkage configuration for the
DataObjects library
@author Martyn Gigg, Tessella plc
Copyright © 2011 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
This file is part of Mantid.
Mantid is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
Mantid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
#include "MantidKernel/System.h"

#ifdef IN_MANTID_ISISLIVEDATA
#define MANTID_ISISLIVEDATA_DLL DLLExport
#else
#define MANTID_ISISLIVEDATA_DLL DLLImport
#endif /* IN_MANTID_ISISLIVEDATA*/

#endif // MANTID_ISISLIVEDATA_DLLCONFIG_H_
15 changes: 15 additions & 0 deletions Code/Mantid/Framework/ISISLiveData/test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
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 ../../TestHelpers/src/ComponentCreationHelper.cpp ../../TestHelpers/src/WorkspaceCreationHelper.cpp )
cxxtest_add_test ( ISISLiveDataTest ${TEST_FILES} )
target_link_libraries( ISISLiveDataTest ISISLiveData )
# Specify implicit dependency, but don't link to it
add_dependencies ( FrameworkTests ISISLiveDataTest )
# Add to the 'FrameworkTests' group in VS
set_property ( TARGET ISISLiveDataTest PROPERTY FOLDER "UnitTests" )
endif ()

0 comments on commit df1a236

Please sign in to comment.