Re #7727. Make RemoteAlgorithms the only thing to depend on Remote.

It's the only thing that needs to. This also removes the incorrect dependency of Remote on DataObjects.
mantidproject · Aug 9, 2013 · cdfa139 · cdfa139
1 parent 39b8ee6
commit cdfa139
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/CMakeLists.txt b/Code/Mantid/Framework/CMakeLists.txt
@@ -96,20 +96,15 @@ if( MATLAB_FOUND )
   add_subdirectory (MatlabAPI)
 endif ()
 
-include_directories (DataObjects/inc)
-add_subdirectory (DataObjects)
-set ( MANTIDLIBS ${MANTIDLIBS} DataObjects )
-
 if(MAKE_REMOTE_JOBS)
-  include_directories (Remote/inc)
   add_subdirectory (Remote)
-  set ( MANTIDLIBS ${MANTIDLIBS} Remote )
-  add_subdirectory (RemoteAlgorithms)  # this line needs to come after the include_directories
-                                       # line in order for things to compile.  This probably
-                                       # means I've done something wrong somewhere else...
-                                       # RGM - 30 April 2013
+  add_subdirectory (RemoteAlgorithms)
 endif(MAKE_REMOTE_JOBS)
 
+include_directories (DataObjects/inc)
+add_subdirectory (DataObjects)
+set ( MANTIDLIBS ${MANTIDLIBS} DataObjects )
+
 add_subdirectory (Nexus)
 add_subdirectory (DataHandling)
 add_subdirectory (Algorithms)

diff --git a/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/RemoteAlgorithms/CMakeLists.txt
@@ -37,9 +37,10 @@ set_target_properties ( RemoteAlgorithms PROPERTIES OUTPUT_NAME MantidRemoteAlgo
 # Add to the 'Framework' group in VS
 set_property ( TARGET RemoteAlgorithms PROPERTY FOLDER "MantidFramework" )
 
+include_directories ( ../Remote/inc )
 include_directories ( inc )
 
-target_link_libraries ( RemoteAlgorithms ${MANTIDLIBS} ${GSL_LIBRARIES} )
+target_link_libraries ( RemoteAlgorithms Remote ${MANTIDLIBS} ${GSL_LIBRARIES} )
 
 # Add the unit tests directory
 #add_subdirectory ( test )  # No tests yet...