Re #7727. Have Remote depend only on Kernel.

It would be allowed to depend on Geometry & API if it needed to, but since it doesn't for now just keep things minimal.
mantidproject · Aug 9, 2013 · 1594d37 · 1594d37
1 parent cdfa139
commit 1594d37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/Code/Mantid/Framework/Remote/CMakeLists.txt b/Code/Mantid/Framework/Remote/CMakeLists.txt
@@ -23,28 +23,12 @@ set_target_properties ( Remote PROPERTIES OUTPUT_NAME MantidRemote
 # Add to the 'Framework' group in VS
 set_property ( TARGET Remote PROPERTY FOLDER "MantidFramework" )
 
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Windows" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	SET (HDF5_DIR "${CMAKE_MODULE_PATH}")
-	#SET (HDF5_CONFIG "${CMAKE_MODULE_PATH}/hdf5-config.cmake" )
-	find_package ( HDF5 COMPONENTS HL REQUIRED
-				        CONFIGS hdf5-config.cmake )
-ELSE()
-	find_package ( HDF5 COMPONENTS HL REQUIRED )
-ENDIF()
-
-#message (STATUS "HDF5_INCLUDE_DIRS:" ${HDF5_INCLUDE_DIRS})
-#message (STATUS "HDF5_LIBRARIES:" ${HDF5_LIBRARIES})
-
-#include_directories ( inc ../Nexus/inc ${HDF5_INCLUDE_DIRS})
-#include_directories ( inc ../Nexus/inc)
-include_directories ( inc)
-
-#target_link_libraries ( Remote ${MANTIDLIBS} Nexus ${NEXUS_LIBRARIES} ${HDF5_LIBRARIES})
-#target_link_libraries ( Remote ${MANTIDLIBS} Nexus)
-target_link_libraries ( Remote ${MANTIDLIBS})
+include_directories ( inc )
+
+target_link_libraries ( Remote Kernel )
 
 # Add the unit tests directory
-add_subdirectory ( test )
+#add_subdirectory ( test )
 
 ###########################################################################
 # Installation settings

diff --git a/Code/Mantid/Framework/Remote/test/CMakeLists.txt b/Code/Mantid/Framework/Remote/test/CMakeLists.txt
@@ -1,15 +1,6 @@
 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
-                         ../../TestHelpers/src/ScopedFileHelper.cpp
-                         ../../TestHelpers/src/StartFrameworkManager.cpp
-      )
-
   cxxtest_add_test ( RemoteTest ${TEST_FILES} )
   target_link_libraries( RemoteTest Remote )
   add_dependencies ( FrameworkTests RemoteTest )