| ... | ... | @@ -58,6 +58,16 @@ endif() |
| 58 | 58 | |
| 59 | 59 | set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") |
| 60 | 60 | |
| 61 | # Handle multi-config builds and place each into a common lib. The VS generator |
| 62 | # for example will append a Debug folder by default if not explicitly specified. |
| 63 | set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR}) |
| 64 | set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR}) |
| 65 | foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES}) |
| 66 | string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE) |
| 67 | set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR}) |
| 68 | set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR}) |
| 69 | endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES) |
| 70 | |
| 61 | 71 | if(ZIG_FORCE_EXTERNAL_LLD) |
| 62 | 72 | find_package(lld) |
| 63 | 73 | include_directories(${LLVM_INCLUDE_DIRS}) |
| ... | ... | @@ -253,7 +263,6 @@ else() |
| 253 | 263 | embedded_lld_wasm |
| 254 | 264 | embedded_lld_lib |
| 255 | 265 | ) |
| 256 | | install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}") |
| 257 | 266 | endif() |
| 258 | 267 | |
| 259 | 268 | # No patches have been applied to SoftFloat-3e |
Marc Tiehuis <marc@tiehu.is> 2019-04-18 18:58:12+12:00
Andrew Kelley <andrew@ziglang.org> 2019-04-30 12:13:41-04:00
ci