authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-01 16:10:05-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-01 16:10:35-04:00
log9636603a3b14bd7205f762f8abb096d9f0ad1ec5
tree6c985436c3cd9a408178111bff42c0f9feb121c2
parent0975e37b162478a0d35c1f4bab9a2d0fb51aa203

fix build when no cmake path args specified

broken by 0227becb564088db4b5598d7253038c92f11b6c2

2 files changed, 4 insertions(+), 4 deletions(-)

CMakeLists.txt+3-3
......@@ -20,9 +20,9 @@ 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})
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}")
2626
2727option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
2828
ci/travis_osx_script+1-1
......@@ -5,7 +5,7 @@ set -e
55
66mkdir build
77cd build
8cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@5/ -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_INCLUDE_DIR=/usr/include
8cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@5/ -DCMAKE_INSTALL_PREFIX=$(pwd)
99make VERBOSE=1
1010make install
1111