Commit c87c0232 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony
Browse files

Link to Kernel in various tests if OpenMP found

With openmp enabled access to the ConfigService is now required
parent 76a41cb8
......@@ -6,12 +6,18 @@ if(CXXTEST_FOUND)
cxxtest_add_test(BeamlineTest ${TEST_FILES} ${GMOCK_TEST_FILES})
target_include_directories(BeamlineTest SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
target_link_libraries(BeamlineTest
LINK_PRIVATE
PRIVATE
${TCMALLOC_LIBRARIES_LINKTIME}
Beamline
Kernel
${Boost_LIBRARIES}
gmock
)
)
if(OpenMP_CXX_FOUND)
# Access to config service is required
target_link_libraries(BeamlineTest PRIVATE Kernel)
endif()
add_dependencies(FrameworkTests BeamlineTest)
# Add to the 'FrameworkTests' group in VS
......
......@@ -77,7 +77,6 @@ add_subdirectory(Beamline)
set(MANTIDLIBS ${MANTIDLIBS} Parallel)
# HistogramData has header-only dependency on Kernel, so Kernel comes after.
set(MANTIDLIBS ${MANTIDLIBS} HistogramData)
# Indexing has header-only dependency on Kernel, so Kernel comes after.
set(MANTIDLIBS ${MANTIDLIBS} Indexing)
set(MANTIDLIBS ${MANTIDLIBS} Kernel)
set(MANTIDLIBS ${MANTIDLIBS} Beamline)
......
......@@ -7,12 +7,17 @@ if(CXXTEST_FOUND)
target_include_directories(HistogramDataTest SYSTEM
PRIVATE ${Boost_INCLUDE_DIRS})
target_link_libraries(HistogramDataTest
LINK_PRIVATE
PRIVATE
${TCMALLOC_LIBRARIES_LINKTIME}
HistogramData
Kernel
${Boost_LIBRARIES}
gmock
)
)
if(OpenMP_CXX_FOUND)
# Access to config service is required
target_link_libraries(HistogramDataTest PRIVATE Kernel)
endif()
add_dependencies(FrameworkTests HistogramDataTest)
# Add to the 'FrameworkTests' group in VS
......
......@@ -10,13 +10,17 @@ if(CXXTEST_FOUND)
cxxtest_add_test(IndexingTest ${TEST_FILES} ${GMOCK_TEST_FILES})
target_link_libraries(IndexingTest
LINK_PRIVATE
PRIVATE
${TCMALLOC_LIBRARIES_LINKTIME}
${MANTIDLIBS}
Indexing
Parallel
gmock
)
)
if(OpenMP_CXX_FOUND)
# Access to config service is required
target_link_libraries(IndexingTest PRIVATE Kernel)
endif()
add_dependencies(FrameworkTests IndexingTest)
# Add to the 'FrameworkTests' group in VS
......
Supports Markdown
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