diff options
| author | Marc Tiehuis <marctiehuis@gmail.com> | 2019-04-18 18:58:12 +1200 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-04-30 12:13:41 -0400 |
| commit | 81767a658d07219a402384f98a7553abcbbd2e70 (patch) | |
| tree | 420dc964e2879b573e42080a1bb12bde9c159178 | |
| parent | b4f8d68e2e48a27ff2a6eea6155873cdbfc8ad38 (diff) | |
| download | zig-81767a658d07219a402384f98a7553abcbbd2e70.tar.gz zig-81767a658d07219a402384f98a7553abcbbd2e70.zip | |
Don't install stage2 artifacts
Fixes #2220.
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | ci/azure/windows_upload | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b017a881c..047d538e83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,16 @@ endif() set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") +# Handle multi-config builds and place each into a common lib. The VS generator +# for example will append a Debug folder by default if not explicitly specified. +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR}) +foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES}) + string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR}) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR}) +endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES) + if(ZIG_FORCE_EXTERNAL_LLD) find_package(lld) include_directories(${LLVM_INCLUDE_DIRS}) @@ -253,7 +263,6 @@ else() embedded_lld_wasm embedded_lld_lib ) - install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}") endif() # No patches have been applied to SoftFloat-3e diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload index d93acbe1d1..8478be0e0b 100755 --- a/ci/azure/windows_upload +++ b/ci/azure/windows_upload @@ -6,7 +6,7 @@ set -e if [ "${BUILD_REASON}" != "PullRequest" ]; then cd "$ZIGBUILDDIR" - rm release/*.lib release/*.exe + rm release/*.exe mv ../LICENSE release/ mv ../zig-cache/langref.html release/ mv release/bin/zig.exe release/ |