diff options
| author | bunnei <bunneidev@gmail.com> | 2018-06-22 14:28:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 14:28:26 -0400 |
| commit | ea1880f47c27c9c0d597584a8fb610e856bb790f (patch) | |
| tree | 11fda117f271f2db51aa8759fc7cc26b36181872 /CMakeModules | |
| parent | 6d7941042bd8badcd8e93521b40cbbc29215351e (diff) | |
| parent | 5c3d5d08495073178bedccbc688ac3f3eb73abe3 (diff) | |
Merge pull request #526 from janisozaur/appveyor-ninja
Use Ninja for MSVC AppVeyor builds
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuSDLDeps.cmake | 2 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuUnicornDeps.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index ed24c742c..bfad52c4a 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -1,6 +1,6 @@ function(copy_yuzu_Qt5_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") set(PLATFORMS ${DLL_DEST}platforms/) diff --git a/CMakeModules/CopyYuzuSDLDeps.cmake b/CMakeModules/CopyYuzuSDLDeps.cmake index 5963684f4..e6f455960 100644 --- a/CMakeModules/CopyYuzuSDLDeps.cmake +++ b/CMakeModules/CopyYuzuSDLDeps.cmake @@ -1,5 +1,5 @@ function(copy_yuzu_SDL_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll) endfunction(copy_yuzu_SDL_deps) diff --git a/CMakeModules/CopyYuzuUnicornDeps.cmake b/CMakeModules/CopyYuzuUnicornDeps.cmake index 7af0ef023..c32f717c8 100644 --- a/CMakeModules/CopyYuzuUnicornDeps.cmake +++ b/CMakeModules/CopyYuzuUnicornDeps.cmake @@ -1,6 +1,6 @@ function(copy_yuzu_unicorn_deps target_dir) include(WindowsCopyFiles) - set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") + set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/") windows_copy_files(${target_dir} ${UNICORN_DLL_DIR} ${DLL_DEST} libgcc_s_seh-1.dll libwinpthread-1.dll |