authorgravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2018-03-10 13:13:48-08:00
committergravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2018-03-10 13:13:48-08:00
log10fb1f2730cb2d1760233622e232b35d21d651ea
tree3bca65111c5df56a7a4882657200746b7675c0c5
parent152b408934a5f933fd5cbdd2fa8cad4b343781bb
parente4fd3fd52b745ec450027656c041e33a9b758c24

Merge branch 'test-ci'

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

CMakeLists.txt+3
...@@ -709,6 +709,9 @@ target_link_libraries(zig LINK_PUBLIC...@@ -709,6 +709,9 @@ target_link_libraries(zig LINK_PUBLIC
709 ${LLVM_LIBRARIES}709 ${LLVM_LIBRARIES}
710 ${CMAKE_THREAD_LIBS_INIT}710 ${CMAKE_THREAD_LIBS_INIT}
711)711)
712if(APPLE)
713 target_link_libraries(zig LINK_PUBLIC xml2)
714endif()
712if(ZIG_DIA_GUIDS_LIB)715if(ZIG_DIA_GUIDS_LIB)
713 target_link_libraries(zig LINK_PUBLIC ${ZIG_DIA_GUIDS_LIB})716 target_link_libraries(zig LINK_PUBLIC ${ZIG_DIA_GUIDS_LIB})
714endif()717endif()
build.zig+1
...@@ -68,6 +68,7 @@ pub fn build(b: &Builder) !void {...@@ -68,6 +68,7 @@ pub fn build(b: &Builder) !void {
6868
69 exe.linkSystemLibrary("pthread");69 exe.linkSystemLibrary("pthread");
70 } else if (exe.target.isDarwin()) {70 } else if (exe.target.isDarwin()) {
71 exe.linkSystemLibrary("xml2");
71 exe.linkSystemLibrary("c++");72 exe.linkSystemLibrary("c++");
72 }73 }
7374