Skip to content
Snippets Groups Projects
Commit 546176ba authored by Michael Reuter's avatar Michael Reuter
Browse files

Building of VisIt dependent projects is now available in CMake system. This refs #1881.

parent 308cd21f
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Code/Mantid/Build/CMake/GetMantidSubProject.cmake
+ 16
− 6
View file @ 546176ba
# Set information for a given Mantid subproject # Set information for a given Mantid subproject
macro ( get_mantid_subproject SUBPROJECT ) macro ( get_mantid_subproject _subproject_path)
set ( TMP Mantid_${SUBPROJECT} )
string ( TOUPPER ${TMP} SUBPROJECT_TAG ) string ( REGEX MATCH "/.+$" _subproject ${_subproject_path} )
string ( REGEX REPLACE "/" "" _subproject ${_subproject} )
set ( _tmp Mantid_${_subproject} )
string ( TOUPPER ${_tmp} SUBPROJECT_TAG )
#message(STATUS "Q: ${ARGN}")
set ( ${SUBPROJECT_TAG}_INCLUDE_DIR set ( ${SUBPROJECT_TAG}_INCLUDE_DIR
${CMAKE_SOURCE_DIR}/Framework/${SUBPROJECT}/inc/Mantid${SUBPROJECT} "${CMAKE_SOURCE_DIR}/${_subproject_path}/inc"
) )
set( ${SUBPROJECT_TAG}_LIBRARY set( ${SUBPROJECT_TAG}_LIBRARY
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Mantid${SUBPROJECT}${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Mantid${_subproject}${CMAKE_SHARED_LIBRARY_SUFFIX}"
) )
endmacro ( get_mantid_subproject SUBPROJECT )
endmacro ( get_mantid_subproject _subproject_path )
Code/Mantid/Vates/CMakeLists.txt
+ 2
− 0
View file @ 546176ba
...@@ -8,8 +8,10 @@ project ( Vates ) ...@@ -8,8 +8,10 @@ project ( Vates )
find_package ( VisIt ) find_package ( VisIt )
if ( VISIT_FOUND ) if ( VISIT_FOUND )
include_directories ( VisitPresenters/inc )
add_subdirectory ( VisitPresenters ) add_subdirectory ( VisitPresenters )
add_subdirectory ( VisitPlugins ) add_subdirectory ( VisitPlugins )
add_subdirectory ( VisitDataBases )
else ( VISIT_FOUND ) else ( VISIT_FOUND )
message ( STATUS "Vates-VisIt plugins and widgets will not be built." ) message ( STATUS "Vates-VisIt plugins and widgets will not be built." )
endif ( VISIT_FOUND ) endif ( VISIT_FOUND )
Code/Mantid/Vates/VisitDataBases/CMakeLists.txt
+ 35
− 48
View file @ 546176ba
# DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
SET(VISIT_INCLUDE_DIR /usr/local/2.1.1/linux-x86_64/include) INCLUDE(${VISIT_INCLUDE_DIR}/PluginVsInstall.cmake)
SET(VISIT_LIBRARY_DIR /usr/local/2.1.1/linux-x86_64/lib) INCLUDE(${VISIT_INCLUDE_DIR}/VisItLibraryDependencies.cmake)
SET(VISIT_BINARY_DIR /usr/local/2.1.1/linux-x86_64/bin)
SET(VISIT_ARCHIVE_DIR /usr/local/2.1.1/linux-x86_64/archives)
SET(VISIT_PLUGIN_DIR /home/owen/.visit/linux-x86_64/plugins)
SET(MANTID_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/)
INCLUDE(/usr/local/2.1.1/linux-x86_64/include/PluginVsInstall.cmake)
INCLUDE(/usr/local/2.1.1/linux-x86_64/include/VisItLibraryDependencies.cmake)
PROJECT(MDFileReader) PROJECT(MDFileReader)
INCLUDE(GetMantidSubProject)
get_mantid_subproject(Framework/API)
get_mantid_subproject(Framework/Geometry)
get_mantid_subproject(Framework/Kernel)
get_mantid_subproject(Framework/MDAlgorithms)
get_mantid_subproject(Framework/MDDataObjects)
get_mantid_subproject(Vates/VisitPresenters)
SET(COMMON_SOURCES SET(COMMON_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/MDFileReaderPluginInfo.C ${CMAKE_CURRENT_SOURCE_DIR}/src/MDFileReaderPluginInfo.C
${CMAKE_CURRENT_SOURCE_DIR}/src/MDFileReaderCommonPluginInfo.C ${CMAKE_CURRENT_SOURCE_DIR}/src/MDFileReaderCommonPluginInfo.C
...@@ -54,54 +56,39 @@ ${VISIT_INCLUDE_DIR}/visit/avt/Pipeline/Sources ...@@ -54,54 +56,39 @@ ${VISIT_INCLUDE_DIR}/visit/avt/Pipeline/Sources
${VISIT_INCLUDE_DIR}/visit/avt/VisWindow/VisWindow ${VISIT_INCLUDE_DIR}/visit/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit/visit_vtk/full ${VISIT_INCLUDE_DIR}/visit/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit/visit_vtk/lightweight ${VISIT_INCLUDE_DIR}/visit/visit_vtk/lightweight
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Kernel/inc/ ${MANTID_API_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Geometry/inc/ ${MANTID_GEOMETRY_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/API/inc/ ${MANTID_KERNEL_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/MDAlgorithms/inc/ ${MANTID_MDDATAOBJECTS_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/MDDataObjects/inc/ ${MANTID_MDALGORITHMS_INCLUDE_DIR}
${MANTID_VISITPRESENTERS_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/inc/VisitDataBases ${CMAKE_CURRENT_SOURCE_DIR}/inc/VisitDataBases
${CMAKE_CURRENT_SOURCE_DIR}/../VisitPresenters/inc/
)
find_library(MantidKernel_LIBRARY
NAMES MantidKernel
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/
) )
find_library(MantidGeometry_LIBRARY # Handle Mantid subproject libraries
NAMES MantidGeometry set ( MANTID_SUBPROJECT_LIBS
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/ Kernel
) Geometry
API
find_library(MantidAPI_LIBRARY MDDataObjects
NAMES MantidAPI MDAlgorithms
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/ VisitPresenters
) #${MANTID_KERNEL_LIBRARY}
#${MANTID_GEOMETRY_LIBRARY}
find_library(MDAlgorithms_LIBRARY #${MANTID_API_LIBRARY}
NAMES MDAlgorithms #${MANTID_MDALGORITHMS_LIBRARY}
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/ #${MANTID_MDDATAOBJECTS_LIBRARY}
) #${MANTID_VISITPRESENTERS_LIBRARY}
find_library(MDDataObjects_LIBRARY
NAMES MDDataObjects
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/
) )
# TODO: Deal with this library better
find_library(HDF5_LIBRARY find_library(HDF5_LIBRARY
NAMES hdf5 NAMES hdf5
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/usr/lib PATHS ${CMAKE_CURRENT_SOURCE_DIR}/usr/lib
) )
find_library(VisitPresenters_LIBRARY LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
NAMES VisitPresenters
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${MANTID_LIBRARY_DIR})
ADD_LIBRARY(IMDFileReaderDatabase ${LIBI_SOURCES}) ADD_LIBRARY(IMDFileReaderDatabase ${LIBI_SOURCES})
TARGET_LINK_LIBRARIES(IMDFileReaderDatabase visitcommon) TARGET_LINK_LIBRARIES(IMDFileReaderDatabase visitcommon)
...@@ -109,13 +96,13 @@ SET(INSTALLTARGETS IMDFileReaderDatabase) ...@@ -109,13 +96,13 @@ SET(INSTALLTARGETS IMDFileReaderDatabase)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(MMDFileReaderDatabase ${LIBM_SOURCES} ) ADD_LIBRARY(MMDFileReaderDatabase ${LIBM_SOURCES} )
TARGET_LINK_LIBRARIES(MMDFileReaderDatabase visitcommon avtdbatts avtdatabase_ser ${MantidKernel_LIBRARY} ${MantidGeometry_LIBRARY} ${MantidAPI_LIBRARY} ${VisitPresenters_LIBRARY} ${MDAlgorithms_LIBRARY} ${MDDataObjects_LIBRARY} ${HDF5_LIBRARY}) TARGET_LINK_LIBRARIES(MMDFileReaderDatabase visitcommon avtdbatts avtdatabase_ser ${MANTID_SUBPROJECT_LIBS} ${HDF5_LIBRARY})
ADD_TARGET_DEFINITIONS(MMDFileReaderDatabase MDSERVER) ADD_TARGET_DEFINITIONS(MMDFileReaderDatabase MDSERVER)
SET(INSTALLTARGETS ${INSTALLTARGETS} MMDFileReaderDatabase) SET(INSTALLTARGETS ${INSTALLTARGETS} MMDFileReaderDatabase)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EMDFileReaderDatabase_ser ${LIBE_SOURCES}) ADD_LIBRARY(EMDFileReaderDatabase_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EMDFileReaderDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${MantidKernel_LIBRARY} ${MantidGeometry_LIBRARY} ${MantidAPI_LIBRARY} ${VisitPresenters_LIBRARY} ${MDAlgorithms_LIBRARY} ${MDDataObjects_LIBRARY} ${HDF5_LIBRARY}) TARGET_LINK_LIBRARIES(EMDFileReaderDatabase_ser visitcommon avtdatabase_ser avtpipeline_ser ${MANTID_SUBPROJECT_LIBS} ${HDF5_LIBRARY})
ADD_TARGET_DEFINITIONS(EMDFileReaderDatabase_ser ENGINE) ADD_TARGET_DEFINITIONS(EMDFileReaderDatabase_ser ENGINE)
SET(INSTALLTARGETS ${INSTALLTARGETS} EMDFileReaderDatabase_ser) SET(INSTALLTARGETS ${INSTALLTARGETS} EMDFileReaderDatabase_ser)
......
Code/Mantid/Vates/VisitPlugins/CMakeLists.txt
+ 33
− 45
View file @ 546176ba
# DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
SET(VISIT_INCLUDE_DIR /usr/local/2.1.1/linux-x86_64/include) INCLUDE(${VISIT_INCLUDE_DIR}/PluginVsInstall.cmake)
SET(VISIT_LIBRARY_DIR /usr/local/2.1.1/linux-x86_64/lib) INCLUDE(${VISIT_INCLUDE_DIR}/VisItLibraryDependencies.cmake)
SET(VISIT_BINARY_DIR /usr/local/2.1.1/linux-x86_64/bin)
SET(VISIT_ARCHIVE_DIR /usr/local/2.1.1/linux-x86_64/archives)
SET(VISIT_PLUGIN_DIR ~/.visit/linux-x86_64/plugins)
SET(MANTID_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/debug/)
INCLUDE(/usr/local/2.1.1/linux-x86_64/include/PluginVsInstall.cmake)
INCLUDE(/usr/local/2.1.1/linux-x86_64/include/VisItLibraryDependencies.cmake)
PROJECT(RebinningCutter) PROJECT(RebinningCutter)
INCLUDE(GetMantidSubProject)
get_mantid_subproject(Framework/API)
get_mantid_subproject(Framework/Geometry)
get_mantid_subproject(Framework/Kernel)
get_mantid_subproject(Framework/MDAlgorithms)
get_mantid_subproject(Framework/MDDataObjects)
get_mantid_subproject(Vates/VisitPresenters)
SET(COMMON_SOURCES SET(COMMON_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/RebinningCutterPluginInfo.C ${CMAKE_CURRENT_SOURCE_DIR}/src/RebinningCutterPluginInfo.C
${CMAKE_CURRENT_SOURCE_DIR}/src/RebinningCutterCommonPluginInfo.C ${CMAKE_CURRENT_SOURCE_DIR}/src/RebinningCutterCommonPluginInfo.C
...@@ -95,17 +97,16 @@ ${QT_QTGUI_INCLUDE_DIR} ...@@ -95,17 +97,16 @@ ${QT_QTGUI_INCLUDE_DIR}
${VTK_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH} ${PYTHON_INCLUDE_PATH}
${VISIT_INCLUDE_DIR}/visit/visitpy/visitpy ${VISIT_INCLUDE_DIR}/visit/visitpy/visitpy
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Framework/Kernel/inc/ ${MANTID_API_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Framework/Geometry/inc/ ${MANTID_GEOMETRY_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Framework/API/inc/ ${MANTID_KERNEL_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Framework/MDAlgorithms/inc/ ${MANTID_MDDATAOBJECTS_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../Mantid/Framework/MDDataObjects/inc/ ${MANTID_MDALGORITHMS_INCLUDE_DIR}
${MANTID_VISITPRESENTERS_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/inc/VisitPlugins ${CMAKE_CURRENT_SOURCE_DIR}/inc/VisitPlugins
${CMAKE_CURRENT_SOURCE_DIR}/../VisitPresenters/inc/
) )
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${QT_LIBRARY_DIR} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${QT_LIBRARY_DIR} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${MANTID_LIBRARY_DIR})
ADD_LIBRARY(IRebinningCutterOperator ${LIBI_SOURCES}) ADD_LIBRARY(IRebinningCutterOperator ${LIBI_SOURCES})
TARGET_LINK_LIBRARIES(IRebinningCutterOperator visitcommon) TARGET_LINK_LIBRARIES(IRebinningCutterOperator visitcommon)
...@@ -136,43 +137,30 @@ IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO ...@@ -136,43 +137,30 @@ IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO
ENDIF(VISIT_JAVA) ENDIF(VISIT_JAVA)
ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
find_library(MantidKernel_LIBRARY # Handle Mantid subproject libraries
NAMES MantidKernel set ( MANTID_SUBPROJECT_LIBS
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/bin Kernel
) Geometry
API
find_library(MantidGeometry_LIBRARY MDDataObjects
NAMES MantidGeometry MDAlgorithms
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/bin VisitPresenters
) #${MANTID_KERNEL_LIBRARY}
#${MANTID_GEOMETRY_LIBRARY}
find_library(MantidAPI_LIBRARY #${MANTID_API_LIBRARY}
NAMES MantidAPI #${MANTID_MDALGORITHMS_LIBRARY}
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/bin #${MANTID_MDDATAOBJECTS_LIBRARY}
) #${MANTID_VISITPRESENTERS_LIBRARY}
find_library(MDAlgorithms_LIBRARY
NAMES MantidMDAlgorithms
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/bin
)
find_library(MantidMDDataObjects_LIBRARY
NAMES MantidMDDataObjects
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/bin
) )
# TODO: Deal with this library better
find_library(HDF5_LIBRARY find_library(HDF5_LIBRARY
NAMES hdf5 NAMES hdf5
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/usr/lib PATHS ${CMAKE_CURRENT_SOURCE_DIR}/usr/lib
) )
find_library(MantidVisitPresenters_LIBRARY
NAMES VisitPresenters
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/bin
)
ADD_LIBRARY(ERebinningCutterOperator_ser ${LIBE_SOURCES}) ADD_LIBRARY(ERebinningCutterOperator_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ERebinningCutterOperator_ser visitcommon avtexpressions_ser avtfilters_ser avtpipeline_ser ${MantidKernel_LIBRARY} ${MantidGeometry_LIBRARY} ${MantidAPI_LIBRARY} ${VisitPresenters_LIBRARY} ${MDAlgorithms_LIBRARY} ${MDDataObjects_LIBRARY} ${HDF5_LIBRARY}) TARGET_LINK_LIBRARIES(ERebinningCutterOperator_ser visitcommon avtexpressions_ser avtfilters_ser avtpipeline_ser ${MANTID_SUBPROJECT_LIBS} ${HDF5_LIBRARY})
SET(INSTALLTARGETS ${INSTALLTARGETS} ERebinningCutterOperator_ser) SET(INSTALLTARGETS ${INSTALLTARGETS} ERebinningCutterOperator_ser)
IF(VISIT_PARALLEL) IF(VISIT_PARALLEL)
......
Code/Mantid/Vates/VisitPresenters/CMakeLists.txt
+ 38
− 8
View file @ 546176ba
project ( VisitPresenters )
set ( SRC_FILES set ( SRC_FILES
src/MultiDimensionalDbPresenter.cpp src/MultiDimensionalDbPresenter.cpp
...@@ -6,7 +7,8 @@ src/RebinningCutterXMLDefinitions.cpp ...@@ -6,7 +7,8 @@ src/RebinningCutterXMLDefinitions.cpp
src/RebinningXMLGenerator.cpp src/RebinningXMLGenerator.cpp
) )
set ( INC_FILES inc/MantidVisitPresenters/MultiDimensionalDbPresenter.h set ( INC_FILES
inc/MantidVisitPresenters/MultiDimensionalDbPresenter.h
inc/MantidVisitPresenters/RebinningCutterPresenter.h inc/MantidVisitPresenters/RebinningCutterPresenter.h
inc/MantidVisitPresenters/RebinningCutterXMLDefinitions.h inc/MantidVisitPresenters/RebinningCutterXMLDefinitions.h
inc/MantidVisitPresenters/RebinningXMLGenerator.h inc/MantidVisitPresenters/RebinningXMLGenerator.h
...@@ -27,14 +29,42 @@ set_target_properties ( VisitPresenters PROPERTIES OUTPUT_NAME MantidVisitPresen ...@@ -27,14 +29,42 @@ set_target_properties ( VisitPresenters PROPERTIES OUTPUT_NAME MantidVisitPresen
# Add to the 'Framework' group in VS # Add to the 'Framework' group in VS
set_property ( TARGET VisitPresenters PROPERTY FOLDER "Framework" ) set_property ( TARGET VisitPresenters PROPERTY FOLDER "Framework" )
include_directories (${CMAKE_CURRENT_SOURCE_DIR}../../Framework/Kernel/inc) #TODO use get_mantid_subproject INCLUDE(GetMantidSubProject)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}../../Framework/API/inc) #TODO use get_mantid_subproject get_mantid_subproject(Framework/API)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}../../Framework/Geometry/inc) #TODO use get_mantid_subproject get_mantid_subproject(Framework/Geometry)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}../../Framework/MDDataObjects/inc) #TODO use get_mantid_subproject get_mantid_subproject(Framework/Kernel)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}../../Framework/MDAlgorithms/inc) #TODO use get_mantid_subproject get_mantid_subproject(Framework/MDAlgorithms)
include_directories (${VISIT_INCLUDE_DIR}/vtk/include/vtk-5.0) #TODO use get_mantid_subproject get_mantid_subproject(Framework/MDDataObjects)
include_directories (
${MANTID_API_INCLUDE_DIR}
${MANTID_GEOMETRY_INCLUDE_DIR}
${MANTID_KERNEL_INCLUDE_DIR}
${MANTID_MDALGORITHMS_INCLUDE_DIR}
# TODO: MDDataObjects headers need to conform to Mantid naming convention
# So we can't use get_mantid_subproject stuff
${CMAKE_CURRENT_SOURCE_DIR}/../../Framework/MDDataObjects/inc
)
include_directories (${VISIT_INCLUDE_DIR}/vtk/include/vtk-5.0)
include_directories (inc) include_directories (inc)
target_link_libraries (VisitPresenters ${MANTIDLIBS} ${VISIT_ROOT}/lib/libvtkCommon${CMAKE_SHARED_LIBRARY_SUFFIX} ${VISIT_ROOT}/lib/libvtkFiltering${CMAKE_SHARED_LIBRARY_SUFFIX}) #TODO: Not the correct way to access shared libraries
message(STATUS "P: ${MANTIDLIBS}")
# Handle Mantid subproject libraries
set ( MANTID_SUBPROJECT_LIBS
Kernel
Geometry
API
MDDataObjects
MDAlgorithms
#${MANTID_KERNEL_LIBRARY}
#${MANTID_GEOMETRY_LIBRARY}
#${MANTID_API_LIBRARY}
#${MANTID_MDALGORITHMS_LIBRARY}
#${MANTID_MDDATAOBJECTS_LIBRARY}
)
target_link_libraries (VisitPresenters ${MANTID_SUBPROJECT_LIBS} ${VISIT_ROOT}/lib/libvtkCommon${CMAKE_SHARED_LIBRARY_SUFFIX} ${VISIT_ROOT}/lib/libvtkFiltering${CMAKE_SHARED_LIBRARY_SUFFIX}) #TODO: Not the correct way to access shared libraries
# Create test file projects # Create test file projects
if ( CXXTEST_FOUND ) if ( CXXTEST_FOUND )
cxxtest_add_test ( VisitPresentersTest ${TEST_FILES} ) cxxtest_add_test ( VisitPresentersTest ${TEST_FILES} )
......
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