| author |  Andrew Kelley <andrew@ziglang.org> 2017-10-01 14:01:18-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2017-10-01 14:01:18-04:00 |
| log | 0227becb564088db4b5598d7253038c92f11b6c2 |
| tree | 5b7e12a4ef6b790b578b2836a536db10798dc9f3 |
| parent | 4bf149795acea088b349be89cb7992a6d413ad9f |
build: escape backslashes in path arguments given to cmake
2 files changed, 7 insertions(+), 3 deletions(-)
CMakeLists.txt+4
| ... | @@ -20,6 +20,10 @@ set(ZIG_LIBC_INCLUDE_DIR "/usr/include" CACHE STRING "Default native target libc | ... | @@ -20,6 +20,10 @@ set(ZIG_LIBC_INCLUDE_DIR "/usr/include" CACHE STRING "Default native target libc |
| 20 | set(ZIG_DYNAMIC_LINKER "" CACHE STRING "Override dynamic linker for native target") | 20 | set(ZIG_DYNAMIC_LINKER "" CACHE STRING "Override dynamic linker for native target") |
| 21 | set(ZIG_EACH_LIB_RPATH off CACHE BOOL "Add each dynamic library to rpath for native target") | 21 | set(ZIG_EACH_LIB_RPATH off CACHE BOOL "Add each dynamic library to rpath for native target") |
| 22 | 22 | ||
| 23 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED ${ZIG_LIBC_LIB_DIR}) | ||
| 24 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_STATIC_LIB_DIR_ESCAPED ${ZIG_LIBC_STATIC_LIB_DIR}) | ||
| 25 | string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_INCLUDE_DIR_ESCAPED ${ZIG_LIBC_INCLUDE_DIR}) | ||
| 26 | |||
| 23 | option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF) | 27 | option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF) |
| 24 | 28 | ||
| 25 | # To see what patches have been applied to LLD in this repository: | 29 | # To see what patches have been applied to LLD in this repository: |
src/config.h.in+3-3
| ... | @@ -15,9 +15,9 @@ | ... | @@ -15,9 +15,9 @@ |
| 15 | 15 | ||
| 16 | #define ZIG_HEADERS_DIR "@CMAKE_INSTALL_PREFIX@/@C_HEADERS_DEST@" | 16 | #define ZIG_HEADERS_DIR "@CMAKE_INSTALL_PREFIX@/@C_HEADERS_DEST@" |
| 17 | #define ZIG_STD_DIR "@CMAKE_INSTALL_PREFIX@/@ZIG_STD_DEST@" | 17 | #define ZIG_STD_DIR "@CMAKE_INSTALL_PREFIX@/@ZIG_STD_DEST@" |
| 18 | #define ZIG_LIBC_INCLUDE_DIR "@ZIG_LIBC_INCLUDE_DIR@" | 18 | #define ZIG_LIBC_INCLUDE_DIR "@ZIG_LIBC_INCLUDE_DIR_ESCAPED@" |
| 19 | #define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR@" | 19 | #define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR_ESCAPED@" |
| 20 | #define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR@" | 20 | #define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR_ESCAPED@" |
| 21 | #define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@" | 21 | #define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@" |
| 22 | 22 | ||
| 23 | #cmakedefine ZIG_EACH_LIB_RPATH | 23 | #cmakedefine ZIG_EACH_LIB_RPATH |