Refs #4024 moving out Nexus CPP from mantid. Tests don't pass yet

mantidproject · Nov 8, 2011 · 76bc443 · 76bc443
1 parent 5d8840b
commit 76bc443
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -48,7 +48,7 @@ add_subdirectory ( Framework )
 include_directories ( Framework/Kernel/inc )
 include_directories ( Framework/Geometry/inc )
 include_directories ( Framework/API/inc )
-set ( CORE_MANTIDLIBS Kernel Geometry API )
+set ( CORE_MANTIDLIBS Kernel Geometry API NeXusCPP)
 
 add_subdirectory ( MantidQt )
 

diff --git a/Code/Mantid/Framework/CMakeLists.txt b/Code/Mantid/Framework/CMakeLists.txt
@@ -90,6 +90,8 @@ set ( MANTIDLIBS  ${Boost_LIBRARIES} ${POCO_LIBRARIES} ${TCMALLOC_LIBRARY} ${MPI
 add_custom_target ( FrameworkTests ) # target for all framework tests
 add_dependencies ( check FrameworkTests )
 
+set ( MANTIDLIBS ${MANTIDLIBS} NeXusCPP )
+
 include_directories (Kernel/inc)
 add_subdirectory (Kernel)
 set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
@@ -151,11 +153,8 @@ add_subdirectory (MDEvents)
 
 set ( FRAMEWORK_LIBS Kernel Geometry API PythonAPI PythonKernelModule PythonAPIModule DataObjects
                      DataHandling Nexus Algorithms CurveFitting ICat
-<<<<<<< HEAD
                      Crystal MDAlgorithms MDEvents WorkflowAlgorithms 
-=======
-                     Crystal MDAlgorithms MDEvents WorkflowAlgorithms NeXus
->>>>>>> Refs #4024 progress towards removing C++ nexus API
+                     Crystal MDAlgorithms MDEvents WorkflowAlgorithms 
 )
 
 add_custom_target( Framework DEPENDS ${FRAMEWORK_LIBS} )