diff --git a/conda/recipes/mantidworkbench/meta.yaml b/conda/recipes/mantidworkbench/meta.yaml index 41c761c69fd4..a1174bca8e87 100644 --- a/conda/recipes/mantidworkbench/meta.yaml +++ b/conda/recipes/mantidworkbench/meta.yaml @@ -47,6 +47,7 @@ requirements: {% if environ.get('INCLUDE_MANTIDDOCS', 'True') != 'False' %} - mantiddocs {{ version }} {% endif %} + - mslice test: imports: diff --git a/mantid-developer-linux.yml b/mantid-developer-linux.yml index 766aba429514..f704f0b89af9 100644 --- a/mantid-developer-linux.yml +++ b/mantid-developer-linux.yml @@ -2,6 +2,7 @@ name: mantid-developer channels: - conda-forge + - mantid dependencies: # Common packages @@ -51,6 +52,7 @@ dependencies: - versioningit>=2.1 - joblib - orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail. + - mslice # Not Windows, OpenGL implementation: - mesa-libgl-devel-cos7-x86_64>=18.3.4 diff --git a/mantid-developer-osx.yml b/mantid-developer-osx.yml index f1cefd37a547..47509e11d13d 100644 --- a/mantid-developer-osx.yml +++ b/mantid-developer-osx.yml @@ -2,6 +2,7 @@ name: mantid-developer channels: - conda-forge + - mantid dependencies: - ccache @@ -49,6 +50,7 @@ dependencies: - versioningit>=2.1 - joblib - orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail. + - mslice # Needed only for development - black # may be out of sync with pre-commit diff --git a/mantid-developer-win.yml b/mantid-developer-win.yml index dacc6f1e7d67..dfc50b320a41 100644 --- a/mantid-developer-win.yml +++ b/mantid-developer-win.yml @@ -2,6 +2,7 @@ name: mantid-developer channels: - conda-forge + - mantid dependencies: - ccache @@ -48,6 +49,7 @@ dependencies: - versioningit>=2.1 - joblib - orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail. + - mslice # Needed only for development - black # may be out of sync with pre-commit - cppcheck==2.14.2 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 776e1e522de5..beb677d39d84 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -29,8 +29,7 @@ foreach(_dir ${_pth_dirs}) list(APPEND _pth_list_install "${_scripts_rel_path}/${_dir}") endforeach() list(APPEND _pth_list_dev ${CMAKE_CURRENT_BINARY_DIR}) -list(APPEND _pth_list_dev ${MSLICE_DEV}) -list(APPEND _pth_list_install "${_scripts_rel_path}/ExternalInterfaces") +# list(APPEND _pth_list_dev ${MSLICE_DEV}) list(APPEND _pth_list_install "${_scripts_rel_path}/ExternalInterfaces") # development copy set(_scripts_pth_src "${CMAKE_CURRENT_BINARY_DIR}/mantid-scripts.pth.src") diff --git a/scripts/ExternalInterfaces/CMakeLists.txt b/scripts/ExternalInterfaces/CMakeLists.txt index 8775b866dee3..a14f752de3b4 100644 --- a/scripts/ExternalInterfaces/CMakeLists.txt +++ b/scripts/ExternalInterfaces/CMakeLists.txt @@ -1,45 +1,15 @@ -# Fetch any externally-managed interfaces -include(ExternalProject) +# Fetch any externally-managed interfaces include(ExternalProject) -# mslice -set(_mslice_external_root ${CMAKE_CURRENT_BINARY_DIR}/src/mslice) -externalproject_add( - mslice - PREFIX ${_mslice_external_root} - UPDATE_DISCONNECTED "false" - GIT_REPOSITORY "https://github.com/mantidproject/mslice.git" - GIT_TAG cf985c648530d78d4d841896a6d2ead92a7a6b86 - EXCLUDE_FROM_ALL 1 - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - TEST_COMMAND "" - INSTALL_COMMAND "" -) -message(STATUS "Fetching/updating mslice") -execute_process( - COMMAND ${CMAKE_COMMAND} ARGS -P ${_mslice_external_root}/tmp/mslice-gitclone.cmake RESULT_VARIABLE _exit_code -) -if(_exit_code EQUAL 0) - execute_process( - COMMAND ${CMAKE_COMMAND} ARGS -P ${_mslice_external_root}/tmp/mslice-gitupdate.cmake RESULT_VARIABLE _exit_code - ) - if(NOT _exit_code EQUAL 0) - message(FATAL_ERROR "Unable to update mslice.") - endif() -else() - message(FATAL_ERROR "Unable to clone mslice") -endif() -# Let the parent lists file know where dev copy of mslice is -set(MSLICE_DEV - ${_mslice_external_root}/src/mslice/src - PARENT_SCOPE -) +# mslice set(_mslice_external_root ${CMAKE_CURRENT_BINARY_DIR}/src/mslice) externalproject_add( mslice PREFIX +# ${_mslice_external_root} UPDATE_DISCONNECTED "false" GIT_REPOSITORY "https://github.com/mantidproject/mslice.git" +# GIT_TAG cf985c648530d78d4d841896a6d2ead92a7a6b86 EXCLUDE_FROM_ALL 1 CONFIGURE_COMMAND "" BUILD_COMMAND "" TEST_COMMAND +# "" INSTALL_COMMAND "" ) message(STATUS "Fetching/updating mslice") execute_process( COMMAND ${CMAKE_COMMAND} ARGS -P +# ${_mslice_external_root}/tmp/mslice-gitclone.cmake RESULT_VARIABLE _exit_code ) if(_exit_code EQUAL 0) +# execute_process( COMMAND ${CMAKE_COMMAND} ARGS -P ${_mslice_external_root}/tmp/mslice-gitupdate.cmake RESULT_VARIABLE +# _exit_code ) if(NOT _exit_code EQUAL 0) message(FATAL_ERROR "Unable to update mslice.") endif() else() +# message(FATAL_ERROR "Unable to clone mslice") endif() Let the parent lists file know where dev copy of mslice is +# set(MSLICE_DEV ${_mslice_external_root}/src/mslice/src PARENT_SCOPE ) -# Installation MSLICE_DEV is only set in PARENT_SCOPE! so don't use it here -foreach(_bundle ${BUNDLES}) - install( - DIRECTORY ${_mslice_external_root}/src/mslice/src/mslice/ - DESTINATION ${_bundle}scripts/ExternalInterfaces/mslice - COMPONENT Runtime - ) -endforeach() +# Installation MSLICE_DEV is only set in PARENT_SCOPE! so don't use it here foreach(_bundle ${BUNDLES}) install( +# DIRECTORY ${_mslice_external_root}/src/mslice/src/mslice/ DESTINATION ${_bundle}scripts/ExternalInterfaces/mslice +# COMPONENT Runtime ) endforeach()