authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-03-01 19:00:03-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-03-01 19:00:03-07:00
log17a36859e75e3cfb9e089c49ff5eed09832edb61
tree1ce55ded4fe7f77dbfb01d76b27cf877b4142c90
parentf72c36cd37a383ca7ca9e09cb6a665dfe2c73365

build: std files each specify install destination

1 files changed, 14 insertions(+), 17 deletions(-)

CMakeLists.txt+14-17
...@@ -130,22 +130,6 @@ set(C_HEADERS...@@ -130,22 +130,6 @@ set(C_HEADERS
130 "${CMAKE_SOURCE_DIR}/c_headers/xtestintrin.h"130 "${CMAKE_SOURCE_DIR}/c_headers/xtestintrin.h"
131)131)
132132
133set(ZIG_STD_SRC
134 "${CMAKE_SOURCE_DIR}/std/bootstrap.zig"
135 "${CMAKE_SOURCE_DIR}/std/builtin.zig"
136 "${CMAKE_SOURCE_DIR}/std/compiler_rt.zig"
137 "${CMAKE_SOURCE_DIR}/std/test_runner.zig"
138 "${CMAKE_SOURCE_DIR}/std/test_runner_libc.zig"
139 "${CMAKE_SOURCE_DIR}/std/test_runner_nolibc.zig"
140 "${CMAKE_SOURCE_DIR}/std/io.zig"
141 "${CMAKE_SOURCE_DIR}/std/os.zig"
142 "${CMAKE_SOURCE_DIR}/std/linux.zig"
143 "${CMAKE_SOURCE_DIR}/std/errno.zig"
144 "${CMAKE_SOURCE_DIR}/std/rand.zig"
145 "${CMAKE_SOURCE_DIR}/std/math.zig"
146 "${CMAKE_SOURCE_DIR}/std/index.zig"
147)
148
149133
150set(ZIG_HOST_LINK_VERSION)134set(ZIG_HOST_LINK_VERSION)
151if (APPLE)135if (APPLE)
...@@ -200,7 +184,20 @@ target_link_libraries(zig LINK_PUBLIC...@@ -200,7 +184,20 @@ target_link_libraries(zig LINK_PUBLIC
200install(TARGETS zig DESTINATION bin)184install(TARGETS zig DESTINATION bin)
201185
202install(FILES ${C_HEADERS} DESTINATION ${C_HEADERS_DEST})186install(FILES ${C_HEADERS} DESTINATION ${C_HEADERS_DEST})
203install(FILES ${ZIG_STD_SRC} DESTINATION ${ZIG_STD_DEST})187
188install(FILES "${CMAKE_SOURCE_DIR}/std/bootstrap.zig" DESTINATION "${ZIG_STD_DEST}")
189install(FILES "${CMAKE_SOURCE_DIR}/std/builtin.zig" DESTINATION "${ZIG_STD_DEST}")
190install(FILES "${CMAKE_SOURCE_DIR}/std/compiler_rt.zig" DESTINATION "${ZIG_STD_DEST}")
191install(FILES "${CMAKE_SOURCE_DIR}/std/test_runner.zig" DESTINATION "${ZIG_STD_DEST}")
192install(FILES "${CMAKE_SOURCE_DIR}/std/test_runner_libc.zig" DESTINATION "${ZIG_STD_DEST}")
193install(FILES "${CMAKE_SOURCE_DIR}/std/test_runner_nolibc.zig" DESTINATION "${ZIG_STD_DEST}")
194install(FILES "${CMAKE_SOURCE_DIR}/std/io.zig" DESTINATION "${ZIG_STD_DEST}")
195install(FILES "${CMAKE_SOURCE_DIR}/std/os.zig" DESTINATION "${ZIG_STD_DEST}")
196install(FILES "${CMAKE_SOURCE_DIR}/std/linux.zig" DESTINATION "${ZIG_STD_DEST}")
197install(FILES "${CMAKE_SOURCE_DIR}/std/errno.zig" DESTINATION "${ZIG_STD_DEST}")
198install(FILES "${CMAKE_SOURCE_DIR}/std/rand.zig" DESTINATION "${ZIG_STD_DEST}")
199install(FILES "${CMAKE_SOURCE_DIR}/std/math.zig" DESTINATION "${ZIG_STD_DEST}")
200install(FILES "${CMAKE_SOURCE_DIR}/std/index.zig" DESTINATION "${ZIG_STD_DEST}")
204201
205add_executable(run_tests ${TEST_SOURCES})202add_executable(run_tests ${TEST_SOURCES})
206target_link_libraries(run_tests)203target_link_libraries(run_tests)