Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix working directory for submodule update command

Browse Source
This commit is contained in:
Dennis Klein 2019-09-11 15:41:43 +02:00
parent 79bcb40c04
commit fa394194e8
No known key found for this signature in database
GPG Key ID: 08E62D23FA0ECBBC
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/FairMQLib.cmake
View File

@ -445,6 +445,23 @@ macro(exec cmd)
endif() endif()
endmacro() endmacro()
macro(exec_source cmd)
join("${ARGN}" " " args)
file(APPEND ${${package}_BUILD_LOGFILE} ">>> ${cmd} ${args}\n")
execute_process(COMMAND ${cmd} ${ARGN}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE log
ERROR_VARIABLE log
RESULT_VARIABLE res
)
file(APPEND ${${package}_BUILD_LOGFILE} ${log})
if(res)
message(FATAL_ERROR "${res} \nSee also \"${${package}_BUILD_LOGFILE}\"")
endif()
endmacro()
function(build_bundled package bundle) function(build_bundled package bundle)
message(STATUS "Building bundled ${package}") message(STATUS "Building bundled ${package}")
@ -455,7 +472,7 @@ function(build_bundled package bundle)
file(REMOVE ${${package}_BUILD_LOGFILE}) file(REMOVE ${${package}_BUILD_LOGFILE})
if(Git_FOUND) if(Git_FOUND)
exec(${GIT_EXECUTABLE} submodule update --init --recursive -- ${${package}_SOURCE_DIR}) exec_source(${GIT_EXECUTABLE} submodule update --init -- ${${package}_SOURCE_DIR})
endif() endif()
if(${package} STREQUAL GTest) if(${package} STREQUAL GTest)