Skip to content

Commit

Permalink
Re #7727. Move MAKE_REMOTE_JOBS flag into CommonSetup.cmake.
Browse files Browse the repository at this point in the history
That way it can be seen by a framework-only build as well.

Also remove the addition of the Remote library to the core mantid libs
and the headers to the include path from the main CMakeLists as nothing
outside of Framework is using it.
  • Loading branch information
RussellTaylor committed Aug 9, 2013
1 parent 07676f8 commit 58653ec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 3 additions & 0 deletions Code/Mantid/Build/CMake/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ if ( stdint )
add_definitions ( -DHAVE_STDINT_H )
endif ( stdint )

# A flag to set whether the code for submitting jobs to a cluster is built or not
set ( MAKE_REMOTE_JOBS ON CACHE BOOL "Add code for executing algorithms on a remote cluster" )

###########################################################################
# Look for dependencies - bail out if any not found
###########################################################################
Expand Down
6 changes: 0 additions & 6 deletions Code/Mantid/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ set( FULL_PACKAGE_BUILD 1 )
# Framework Build options
set ( CXXTEST_SINGLE_LOGFILE CACHE BOOL "Switch to have the tests for each package run together")
set ( CXXTEST_ADD_PERFORMANCE OFF CACHE BOOL "Switch to add Performance tests to the list of tests run by ctest?")
set ( MAKE_REMOTE_JOBS ON CACHE BOOL "Add code for executing algorithms on a remote cluster")

add_subdirectory ( Framework )

Expand All @@ -117,11 +116,6 @@ include_directories ( Framework/API/inc )

set ( CORE_MANTIDLIBS Kernel Geometry API )

if ( MAKE_REMOTE_JOBS )
include_directories ( Framework/Remote/inc )
LIST( APPEND CORE_MANTIDLIBS Remote)
endif (MAKE_REMOTE_JOBS)

# Add a target for all GUI tests
add_custom_target ( GUITests )
add_dependencies ( check GUITests )
Expand Down

0 comments on commit 58653ec

Please sign in to comment.