Skip to content

Commit 2d4ed63

Browse files
authored
[cmake] remove superseded to_path commands
See https://cmake.org/cmake/help/latest/command/file.html
1 parent f956573 commit 2d4ed63

File tree

8 files changed

+19
-21
lines changed

8 files changed

+19
-21
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ if(MSVC)
426426
else()
427427
set(_os_cat "cat")
428428
endif()
429-
file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" _from_native)
430-
file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/include/ROOT.modulemap" _to_native)
429+
cmake_path(CONVERT "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" TO_NATIVE_PATH_LIST _from_native)
430+
cmake_path(CONVERT "${CMAKE_BINARY_DIR}/include/ROOT.modulemap" TO_NATIVE_PATH_LIST _to_native)
431431

432432
add_custom_target(copymodulemap DEPENDS "${CMAKE_BINARY_DIR}/include/ROOT.modulemap")
433433
add_custom_command(

cmake/modules/FindArrow.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ function(arrow_find_package
358358
endfunction()
359359

360360
if(NOT "$ENV{ARROW_HOME}" STREQUAL "")
361-
file(TO_CMAKE_PATH "$ENV{ARROW_HOME}" ARROW_HOME)
361+
cmake_path(CONVERT "$ENV{ARROW_HOME}" TO_CMAKE_PATH_LIST ARROW_HOME)
362362
endif()
363363
arrow_find_package(ARROW
364364
"${ARROW_HOME}"

cmake/modules/RootConfiguration.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,9 +641,9 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/RootUseFile.cmake.in
641641

642642
#---To be used from the install tree--------------------------------------------------------------------------
643643
# Need to calculate actual relative paths from CMAKEDIR to other locations
644-
file(RELATIVE_PATH ROOT_CMAKE_TO_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
645-
file(RELATIVE_PATH ROOT_CMAKE_TO_LIB_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}")
646-
file(RELATIVE_PATH ROOT_CMAKE_TO_BIN_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_BINDIR}")
644+
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_INCLUDEDIR BASE_DIRECTORY "${CMAKE_INSTALL_FULL_CMAKEDIR}" OUTPUT_VARIABLE ROOT_CMAKE_TO_INCLUDE_DIR)
645+
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR BASE_DIRECTORY "${CMAKE_INSTALL_FULL_CMAKEDIR}" OUTPUT_VARIABLE ROOT_CMAKE_TO_LIB_DIR)
646+
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_BINDIR BASE_DIRECTORY "${CMAKE_INSTALL_FULL_CMAKEDIR}" OUTPUT_VARIABLE ROOT_CMAKE_TO_BIN_DIR)
647647

648648
# '_' prefixed variables are used to construct the paths,
649649
# while the normal variants evaluate to full paths at runtime

cmake/modules/RootMacros.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,7 +1858,8 @@ endfunction()
18581858
# ROOT_ADD_TEST_SUBDIRECTORY( <name> )
18591859
#----------------------------------------------------------------------------
18601860
function(ROOT_ADD_TEST_SUBDIRECTORY subdir)
1861-
file(RELATIVE_PATH subdir ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
1861+
set(fullsubdir ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
1862+
cmake_path(RELATIVE_PATH fullsubdir BASE_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE subdir)
18621863
set_property(GLOBAL APPEND PROPERTY ROOT_TEST_SUBDIRS ${subdir})
18631864
endfunction()
18641865

@@ -2089,7 +2090,7 @@ endfunction()
20892090
# install_dir - The install subdirectory relative to CMAKE_INSTALL_PREFIX
20902091
#----------------------------------------------------------------------------
20912092
function(ROOT_APPEND_LIBDIR_TO_INSTALL_RPATH target install_dir)
2092-
file(RELATIVE_PATH to_libdir "${CMAKE_INSTALL_PREFIX}/${install_dir}" "${CMAKE_INSTALL_FULL_LIBDIR}")
2093+
cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${install_dir}" OUTPUT_VARIABLE to_libdir)
20932094

20942095
# New path
20952096
if(APPLE)
@@ -3056,7 +3057,7 @@ function(ROOTTEST_ADD_TEST testname)
30563057
string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} fpath ${fpath})
30573058
string(REPLACE ${fext} "" fpath ${fpath})
30583059
string(REPLACE "." "" fext ${fext})
3059-
file(TO_NATIVE_PATH "${fpath}" fpath)
3060+
cmake_path(CONVERT "${fpath}" TO_NATIVE_PATH_LIST fpath)
30603061
set(postcmd POSTCMD cmd /c if exist ${fpath}_${fext}.rootmap del ${fpath}_${fext}.rootmap)
30613062
endif()
30623063
endif()

cmake/modules/RootTestDriver.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ endif()
8686

8787
if(SYS)
8888
if(WIN32)
89-
file(TO_NATIVE_PATH ${SYS}/bin _path)
89+
cmake_path(CONVERT "${SYS}/bin" TO_NATIVE_PATH_LIST _path)
9090
set(ENV{PATH} "${_path};$ENV{PATH}")
9191
elseif(APPLE)
9292
set(ENV{PATH} ${SYS}/bin:$ENV{PATH})

interpreter/cling/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,7 @@ macro(add_cling_library name)
295295
set(srcs)
296296
if(MSVC_IDE OR XCODE)
297297
# Add public headers
298-
file(RELATIVE_PATH lib_path
299-
${CLING_SOURCE_DIR}/lib/
300-
${CMAKE_CURRENT_SOURCE_DIR}
301-
)
298+
cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR BASE_DIRECTORY ${CLING_SOURCE_DIR}/lib/ OUTPUT_VARIABLE lib_path)
302299
if(NOT lib_path MATCHES "^[.][.]")
303300
file( GLOB_RECURSE headers
304301
${CLING_SOURCE_DIR}/include/cling/${lib_path}/*.h

roottest/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project(roottest)
55
# If no explicit ROOTSYS is set, use ${ROOTSYS} environment variable to search
66
# for ROOT. This may be set by sourcing thisroot.sh from an installation.
77
if(NOT DEFINED ROOTSYS AND DEFINED ENV{ROOTSYS})
8-
file(TO_CMAKE_PATH $ENV{ROOTSYS} ROOTSYS)
8+
cmake_path(CONVERT "$ENV{ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
99
list(INSERT CMAKE_PREFIX_PATH 0 ${ROOTSYS})
1010
endif()
1111

@@ -58,10 +58,10 @@ if(MSVC)
5858
# ROOT_BINDIR is set by ROOTConfig.cmake
5959
set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config.bat)
6060
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
61-
file(TO_CMAKE_PATH ${ROOTSYS} ROOTSYS)
61+
cmake_path(CONVERT "${ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
6262
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
6363
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
64-
file(TO_CMAKE_PATH ${ROOT_TUTORIALS_DIR} ROOT_TUTORIALS_DIR)
64+
cmake_path(CONVERT "${ROOT_TUTORIALS_DIR}" TO_CMAKE_PATH_LIST ROOT_TUTORIALS_DIR)
6565
set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe)
6666
set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd.exe)
6767
set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex.exe)
@@ -76,12 +76,12 @@ if(MSVC)
7676
include(${ROOT_USE_FILE})
7777
set(ROOT_CONFIG_EXECUTABLE root-config.bat)
7878
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
79-
file(TO_CMAKE_PATH ${ROOTSYS} ROOTSYS)
79+
cmake_path(CONVERT "${ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS)
8080
set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
8181
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--srcdir" OUTPUT_VARIABLE ROOT_SOURCE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
82-
file(TO_CMAKE_PATH ${ROOT_SOURCE_DIR} ROOT_SOURCE_DIR)
82+
cmake_path(CONVERT "${ROOT_SOURCE_DIR}" TO_CMAKE_PATH_LIST ROOT_SOURCE_DIR)
8383
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
84-
file(TO_CMAKE_PATH ${ROOT_TUTORIALS_DIR} ROOT_TUTORIALS_DIR)
84+
cmake_path(CONVERT "${ROOT_TUTORIALS_DIR}" TO_CMAKE_PATH_LIST ROOT_TUTORIALS_DIR)
8585
execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--features" OUTPUT_VARIABLE ROOT_FEATURES RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
8686
separate_arguments(ROOT_FEATURES)
8787
foreach(item ${ROOT_FEATURES})

roottest/root/meta/genreflex/noStreamer_noInputOperator/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ROOTTEST_ADD_TEST(customStreamer
2121
# generated streamer
2222
ROOTTEST_GENERATE_REFLEX_DICTIONARY(noStreamer_false_rflx foo.h SELECTION noStreamer_false_selection.xml)
2323

24-
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/noStreamer_false_rflx.cxx" NOSTREAMER_FALSE_RFLX)
24+
cmake_path(CONVERT "${CMAKE_CURRENT_BINARY_DIR}/noStreamer_false_rflx.cxx" TO_NATIVE_PATH_LIST NOSTREAMER_FALSE_RFLX)
2525
ROOTTEST_ADD_TEST(noStreamerFalseDict
2626
COMMAND ${grep_cmd} "void Foo::Streamer(TBuffer &R__b)" ${NOSTREAMER_FALSE_RFLX}
2727
WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}

0 commit comments

Comments
 (0)