authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-01 14:01:18-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-01 14:01:18-04:00
log0227becb564088db4b5598d7253038c92f11b6c2
tree5b7e12a4ef6b790b578b2836a536db10798dc9f3
parent4bf149795acea088b349be89cb7992a6d413ad9f

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
2020set(ZIG_DYNAMIC_LINKER "" CACHE STRING "Override dynamic linker for native target")
2121set(ZIG_EACH_LIB_RPATH off CACHE BOOL "Add each dynamic library to rpath for native target")
2222
23string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED ${ZIG_LIBC_LIB_DIR})
24string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_STATIC_LIB_DIR_ESCAPED ${ZIG_LIBC_STATIC_LIB_DIR})
25string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_INCLUDE_DIR_ESCAPED ${ZIG_LIBC_INCLUDE_DIR})
26
2327option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
2428
2529# To see what patches have been applied to LLD in this repository:
src/config.h.in+3-3
......@@ -15,9 +15,9 @@
1515
1616#define ZIG_HEADERS_DIR "@CMAKE_INSTALL_PREFIX@/@C_HEADERS_DEST@"
1717#define ZIG_STD_DIR "@CMAKE_INSTALL_PREFIX@/@ZIG_STD_DEST@"
18#define ZIG_LIBC_INCLUDE_DIR "@ZIG_LIBC_INCLUDE_DIR@"
19#define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR@"
20#define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR@"
18#define ZIG_LIBC_INCLUDE_DIR "@ZIG_LIBC_INCLUDE_DIR_ESCAPED@"
19#define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR_ESCAPED@"
20#define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR_ESCAPED@"
2121#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"
2222
2323#cmakedefine ZIG_EACH_LIB_RPATH