Skip to content

Commit 9946d02

Browse files
committed
[roottest] set build dit when compile macro
Try to create many temporary files in source directory where macro is situated. Most significant draw back has on Windows when several files has to be moved or deleted from source directory
1 parent 91763ad commit 9946d02

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

roottest/cmake/modules/RoottestMacros.cmake

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)
218218
-e "gROOT->SetMacroPath(\"${CMAKE_CURRENT_SOURCE_DIR}\")"
219219
-e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
220220
-e "gSystem->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
221+
-e "gSystem->SetBuildDir(\"${CMAKE_CURRENT_BINARY_DIR}\", true)"
221222
${RootMacroDirDefines})
222223

223224
set(root_compile_macro ${ROOT_root_CMD} ${RootMacroBuildDefines} -q -l -b)
@@ -280,21 +281,6 @@ macro(ROOTTEST_COMPILE_MACRO filename)
280281
FIXTURES_REQUIRED ${ARG_FIXTURES_REQUIRED})
281282
endif()
282283
283-
if(MSVC)
284-
string(REPLACE "." "_" dll_name ${filename})
285-
add_custom_command(TARGET ${compile_target} POST_BUILD
286-
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.dll
287-
${CMAKE_CURRENT_BINARY_DIR}/
288-
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}_ACLiC_dict_rdict.pcm
289-
${CMAKE_CURRENT_BINARY_DIR}/
290-
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.d
291-
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.def
292-
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.dll
293-
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.exp
294-
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.lib
295-
COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}_ACLiC_dict_rdict.pcm)
296-
endif()
297-
298284
endmacro(ROOTTEST_COMPILE_MACRO)
299285
300286
#-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)