Skip to content
Snippets Groups Projects
Commit 086af8bb authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Refs #14417. Use vtkjsoncpp instead of mantid's version.

parent db07c3da
No related merge requests found
Showing
with 16 additions and 15 deletions
......@@ -10,7 +10,7 @@ target_link_libraries( MantidParaViewPeaksFilterSMPlugin LINK_PRIVATE ${TCMALLOC
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -8,7 +8,7 @@ set_property( TARGET MantidParaViewScaleWorkspaceSMPlugin PROPERTY FOLDER "Manti
target_link_libraries( MantidParaViewScaleWorkspaceSMPlugin LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${MANTID_SUBPROJECT_LIBS}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -14,8 +14,9 @@ target_link_libraries( MantidParaViewSplatterPlotSMPlugin LINK_PRIVATE ${TCMALLO
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${QWT_LIBRARIES})
${QWT_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
set_target_properties ( MantidParaViewSplatterPlotSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
......
......@@ -14,7 +14,7 @@ target_link_libraries( MantidParaViewEventNexusReaderSMPlugin LINK_PRIVATE ${TCM
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
${QWT_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -11,10 +11,10 @@ set_property( TARGET MantidParaViewMDEWNexusReaderSMPlugin PROPERTY FOLDER "Mant
include_directories ( SYSTEM ${QWT_INCLUDE_DIR} )
target_link_libraries( MantidParaViewMDEWNexusReaderSMPlugin LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${vtkjsoncpp_LIBRARIES}
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${QWT_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -14,7 +14,7 @@ target_link_libraries( MantidParaViewMDHWNexusReaderSMPlugin LINK_PRIVATE ${TCMA
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
${QWT_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -14,7 +14,7 @@ target_link_libraries( MantidParaViewSQWEventReaderSMPlugin LINK_PRIVATE ${TCMAL
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
${QWT_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -12,7 +12,7 @@ target_link_libraries( MantidParaViewMDEWSourceSMPlugin LINK_PRIVATE ${TCMALLOC_
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
${QWT_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -13,7 +13,7 @@ target_link_libraries( MantidParaViewMDHWSourceSMPlugin LINK_PRIVATE ${TCMALLOC_
${MANTID_SUBPROJECT_LIBS}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${vtkjsoncpp_LIBRARIES}
${QWT_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
......
......@@ -212,11 +212,11 @@ vtkCommonDataModel
vtkIOLegacy
vtkFiltersExtraction
vtkFiltersSources
${vtkjsoncpp_LIBRARIES}
vtkPVVTKExtensionsDefault
${QWT_LIBRARIES}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${NEXUS_LIBRARIES}
)
......@@ -261,9 +261,9 @@ if( CXXTEST_FOUND AND GMOCK_FOUND AND GTEST_FOUND )
vtkIOLegacy
vtkFiltersExtraction
vtkFiltersSources
${vtkjsoncpp_LIBRARIES}
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
${GMOCK_LIBRARIES}
${GTEST_LIBRARIES} )
add_dependencies( AllTests VatesAPITest )
......
......@@ -137,6 +137,7 @@ include_directories( SYSTEM ${PARAVIEW_INCLUDE_DIRS} )
target_link_libraries( VatesSimpleGuiViewWidgets LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
pqApplicationComponents
pqComponents
${vtkjsoncpp_LIBRARIES}
vtkPVServerManagerRendering
vtkRenderingFreeType
vtksys
......@@ -151,7 +152,6 @@ ${PYTHON_LIBRARIES}
MantidWidgets
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${JSONCPP_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
......@@ -171,6 +171,7 @@ if( CXXTEST_FOUND AND GMOCK_FOUND AND GTEST_FOUND )
target_link_libraries( VatesSimpleGuiViewWidgetsTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
VatesSimpleGuiViewWidgets
${vtkjsoncpp_LIBRARIES}
DataHandling
Kernel
DataObjects
......@@ -179,8 +180,7 @@ if( CXXTEST_FOUND AND GMOCK_FOUND AND GTEST_FOUND )
${POCO_LIBRARIES}
${Boost_LIBRARIES}
${GMOCK_LIBRARIES}
${GTEST_LIBRARIES}
${JSONCPP_LIBRARIES})
${GTEST_LIBRARIES})
add_dependencies( AllTests VatesSimpleGuiViewWidgetsTest )
# Add to the 'UnitTests' group in VS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment