Skip to content
Snippets Groups Projects

Use Unix commands instead of CMake alternatives for cp, rm, mkdir

Merged Use Unix commands instead of CMake alternatives for cp, rm, mkdir
clemenci/LbScripts:fix-ganga-tools into master
1 unresolved thread
Merged Marco Clemencic requested to merge clemenci/LbScripts:fix-ganga-tools into master
1 unresolved thread
Compare
and
1 file
+ 16
− 10
Compare changes
  • Side-by-side
  • Inline
LbUtils/cmake/GangaTools.cmake
+ 16
− 10
@@ -46,9 +46,9 @@ function(ganga_input_sandbox)
set(dist_base_dir ${GANGA_BINARY_DIR}/${CMAKE_PROJECT_NAME}_${CMAKE_PROJECT_VERSION})
add_custom_target(ganga-clean-install
COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}
COMMAND rm -r -f ${CMAKE_INSTALL_PREFIX}
Please register or sign in to reply
COMMAND ${CMAKE_MAKE_PROGRAM} install
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/python
COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/python
COMMAND ${CMAKE_MAKE_PROGRAM} post-install
COMMENT "Preparing InstallArea for input sandbox")
@@ -57,23 +57,25 @@ function(ganga_input_sandbox)
if(EXISTS ${CMAKE_SOURCE_DIR}/${src})
if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/${src})
set(copy_sources ${copy_sources}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${src} ${dist_base_dir}/${src})
COMMAND mkdir -p ${dist_base_dir}/${src}
COMMAND cp -a ${src}/. ${dist_base_dir}/${src}/.)
else()
set(copy_sources ${copy_sources}
COMMAND ${CMAKE_COMMAND} -E copy ${src} ${dist_base_dir}/${src})
COMMAND cp -a ${src} ${dist_base_dir}/${src})
endif()
endif()
endforeach()
add_custom_target(ganga-dist-prepare
COMMAND ${CMAKE_COMMAND} -E remove_directory ${dist_base_dir}
COMMAND rm -r -f ${dist_base_dir}
COMMAND mkdir -p ${dist_base_dir}/InstallArea/${BINARY_TAG}
${copy_sources}
COMMAND ${CMAKE_COMMAND} -E copy_directory InstallArea/${BINARY_TAG} ${dist_base_dir}/InstallArea/${BINARY_TAG}
COMMAND cp -a InstallArea/${BINARY_TAG}/. ${dist_base_dir}/InstallArea/${BINARY_TAG}/.
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
DEPENDS ganga-clean-install)
add_custom_target(ganga-input-sandbox
COMMAND ${CMAKE_COMMAND} -E remove -f ${GANGA_INPUT_SANDBOX_FILE}
COMMAND ${CMAKE_COMMAND} -E tar cfz ${GANGA_INPUT_SANDBOX_FILE}
COMMAND rm -f ${GANGA_INPUT_SANDBOX_FILE}
COMMAND tar -c -z -f ${GANGA_INPUT_SANDBOX_FILE}
run ${CMAKE_PROJECT_NAME}_${CMAKE_PROJECT_VERSION}
WORKING_DIRECTORY ${GANGA_BINARY_DIR}
DEPENDS ganga-dist-prepare
@@ -81,6 +83,10 @@ function(ganga_input_sandbox)
endfunction()
function(enable_ganga_integration)
ganga_create_job_runner()
ganga_input_sandbox()
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_SOURCE_DIR}/InstallArea/${BINARY_TAG}")
ganga_create_job_runner()
ganga_input_sandbox()
else()
message(WARNING "ganga-input-sandbox is not supported for non standard installation")
endif()
endfunction()