From 36b6567f3f688b9c65ec8ba5b5acbabc173c1ba6 Mon Sep 17 00:00:00 2001 From: Blake Friedman Date: Tue, 19 Nov 2024 03:23:58 -0800 Subject: [PATCH] CMake Windows path normalization Summary: Use `file(TO_CMAKE_PATH` to normalize paths, and normalizing `input_SRC` as it's already a CMake path. Changelog: [Internal] Reviewed By: rshest Differential Revision: D66101321 --- .../cmake-utils/ReactNative-application.cmake | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake index 2aeb9f5c46c576..19dd6d632a131b 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -31,10 +31,8 @@ if(CCACHE_FOUND) endif(CCACHE_FOUND) set(BUILD_DIR ${PROJECT_BUILD_DIR}) -if(CMAKE_HOST_WIN32) - string(REPLACE "\\" "/" BUILD_DIR ${BUILD_DIR}) - string(REPLACE "\\" "/" REACT_ANDROID_DIR ${REACT_ANDROID_DIR}) -endif() +file(TO_CMAKE_PATH "${BUILD_DIR}" BUILD_DIR) +file(TO_CMAKE_PATH "${REACT_ANDROID_DIR}" REACT_ANDROID_DIR) if (PROJECT_ROOT_DIR) # This empty `if` is just to silence a CMake warning and make sure the `PROJECT_ROOT_DIR` @@ -45,11 +43,6 @@ file(GLOB input_SRC CONFIGURE_DEPENDS ${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp ${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp) -# Ensure that `input_SRC` paths use forward slashes -foreach(path IN LISTS input_SRC) - string(REPLACE "\\" "/" path "${path}") -endforeach() - add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC}) target_include_directories(${CMAKE_PROJECT_NAME}