Skip to content

[build] Support source or build directory with spaces #19795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

[build] Support source or build directory with spaces #19795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57590e3
[toremove] test escaping in ci
ferdymercury Sep 1, 2025
1a0eb2a
fix wsp compilation
ferdymercury Sep 1, 2025
60304b6
instfix
ferdymercury Sep 1, 2025
3115359
paths
ferdymercury Sep 1, 2025
0947f2c
fix replace
ferdymercury Sep 1, 2025
6b8b46f
Update .github/workflows/root-ci-config/build_root.py
ferdymercury Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,20 +421,11 @@ get_property(__allBuiltins GLOBAL PROPERTY ROOT_BUILTIN_TARGETS)
add_custom_target(move_headers ALL DEPENDS ${__allHeaders} ${__allBuiltins} gitinfotxt)

#---CXX MODULES-----------------------------------------------------------------------------------
if(MSVC)
set(_os_cat "type")
else()
set(_os_cat "cat")
endif()
cmake_path(CONVERT "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" TO_NATIVE_PATH_LIST _from_native)
cmake_path(CONVERT "${CMAKE_BINARY_DIR}/include/ROOT.modulemap" TO_NATIVE_PATH_LIST _to_native)

add_custom_target(copymodulemap DEPENDS "${CMAKE_BINARY_DIR}/include/ROOT.modulemap")
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/include/ROOT.modulemap"
OUTPUT "${CMAKE_BINARY_DIR}/include/ROOT.modulemap"
DEPENDS cmake/unix/module.modulemap "${CMAKE_BINARY_DIR}/include/module.modulemap.extra"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/cmake/unix/module.modulemap" "${CMAKE_BINARY_DIR}/include/ROOT.modulemap"
COMMAND ${_os_cat} "${_from_native}" >> "${_to_native}"
COMMAND ${CMAKE_COMMAND} -E cat "${CMAKE_SOURCE_DIR}/cmake/unix/module.modulemap" "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" > "${CMAKE_BINARY_DIR}/include/ROOT.modulemap"
)
install(FILES "${CMAKE_BINARY_DIR}/include/ROOT.modulemap" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)

Expand Down Expand Up @@ -506,22 +497,22 @@ else()
${CMAKE_SOURCE_DIR} . ${pyroot_legacy} ${__cling_pch}
COMMAND
${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ${Python3_EXECUTABLE}
${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch
${__allIncludes} -I${CMAKE_BINARY_DIR}/include -I${CMAKE_SOURCE_DIR}/core
"${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py" etc/allDict.cxx.pch
${__allIncludes} -I"${CMAKE_BINARY_DIR}/include" -I"${CMAKE_SOURCE_DIR}/core"
DEPENDS
rootcling ${__pch_dependencies} ${__pch_dictionaries}
${CMAKE_SOURCE_DIR}/cmake/unix/makepchinput.py
${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py
"${CMAKE_SOURCE_DIR}/cmake/unix/makepchinput.py"
"${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py"
)
add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
install(FILES "${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch" DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
install(DIRECTORY "${CMAKE_BINARY_DIR}/etc/dictpch" DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
endif()

# FIXME: move installation of PCMS in ROOT_GENERATE_DICTIONARY().
# We are excluding directories, which are accidentaly copied via unxpected behaviour of install(DIRECTORY ..)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/lib/
DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
DESTINATION ${CMAKE_INSTALL_LIBDIR}
FILES_MATCHING
PATTERN "*.pcm"
Expand All @@ -545,7 +536,8 @@ if(runtime_cxxmodules)
set(modules_idx_cmd COMMAND ${CMAKE_COMMAND} -E env PATH="${library_output_dir}\\\;%PATH%"
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
else()
set(modules_idx_cmd COMMAND ${ld_library_path}=${library_output_dir}:$ENV{${ld_library_path}}
cmake_path(CONVERT ${library_output_dir} TO_NATIVE_PATH_LIST library_output_dir)
set(modules_idx_cmd COMMAND ${CMAKE_COMMAND} -E env ${ld_library_path}=${library_output_dir}:$ENV{${ld_library_path}}
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
endif()
add_custom_command(OUTPUT ${library_output_dir}/modules.idx
Expand All @@ -569,7 +561,7 @@ if(WIN32)
set(hsimple_cmd COMMAND ${CMAKE_COMMAND} -E env PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\\\;%PATH%"
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b -n -x ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C -e return)
else()
set(hsimple_cmd COMMAND ${MODULES_ROOT_INCPATH} ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
set(hsimple_cmd COMMAND ${CMAKE_COMMAND} -E env ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b -n -x ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C -e return)
endif()
add_custom_command(OUTPUT tutorials/hsimple.root
Expand Down
2 changes: 1 addition & 1 deletion core/thread/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ target_include_directories(Thread PUBLIC

# keep include directory for ROOT/RSha256.hxx private
set_source_files_properties(src/RConcurrentHashColl.cxx
PROPERTIES COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/core/foundation/res)
PROPERTIES COMPILE_FLAGS -I"${CMAKE_SOURCE_DIR}/core/foundation/res")

if((tbb OR builtin_tbb) AND NOT MSVC)
target_include_directories(Thread PRIVATE ${TBB_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions graf2d/asimage/src/libAfterImage/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ mkdir:
)

install.static: mkdir
$(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR)
$(INSTALL_SCRIPT) afterimage-libs afterimage-config "$(AFTER_BIN_DIR)"
@(if [ -d $(LIBDIR) ] && [ -w $(LIBDIR) ]; then \
echo "$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR)"; \
$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR); \
Expand All @@ -155,7 +155,7 @@ install.script:
install.dyn: mkdir
@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \
$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \
$(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR); \
$(INSTALL_SCRIPT) afterimage-libs afterimage-config "$(AFTER_BIN_DIR)"; \
$(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
Expand Down
2 changes: 1 addition & 1 deletion interpreter/llvm-project/llvm/cmake/modules/AddLLVM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2392,7 +2392,7 @@ function(llvm_setup_rpath name)
if(LLVM_LINKER_IS_GNULD AND NOT ${LLVM_LIBRARY_OUTPUT_INTDIR} STREQUAL "")
# $ORIGIN is not interpreted at link time by ld.bfd
set_property(TARGET ${name} APPEND_STRING PROPERTY
LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ")
LINK_FLAGS " -Wl,-rpath-link,\"${LLVM_LIBRARY_OUTPUT_INTDIR}\" ")
endif()
else()
return()
Expand Down
Loading