diff options
| author |  bunnei | 2018-01-17 13:50:38 -0500 |
|---|---|---|
| committer |  GitHub | 2018-01-17 13:50:38 -0500 |
| commit | c7452bab90fc0ff5ebc446ee3d39f45bd7a7fbd1 (patch) | |
| tree | cd4026c92d44c40945b899252367b0b0e8a2cad6 /src | |
| parent | Merge pull request #57 from nkatz565/fix-tr (diff) | |
| parent | Update CMakeLists.txt (diff) | |
| download | yuzu-c7452bab90fc0ff5ebc446ee3d39f45bd7a7fbd1.tar.gz yuzu-c7452bab90fc0ff5ebc446ee3d39f45bd7a7fbd1.tar.xz yuzu-c7452bab90fc0ff5ebc446ee3d39f45bd7a7fbd1.zip | |
Merge pull request #42 from N00byKing/3295
Implement Pull #3295 from citra: citra_qt: CMakeLists: Drop leftover handling code for Qt 4 UI files
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index c52d5627a..f5c46f1e9 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -66,11 +66,7 @@ file(GLOB_RECURSE THEMES ${CMAKE_SOURCE_DIR}/dist/qt_themes/*) | |||
| 66 | 66 | ||
| 67 | create_directory_groups(${SRCS} ${HEADERS} ${UIS}) | 67 | create_directory_groups(${SRCS} ${HEADERS} ${UIS}) |
| 68 | 68 | ||
| 69 | if (Qt5_FOUND) | 69 | qt5_wrap_ui(UI_HDRS ${UIS}) |
| 70 | qt5_wrap_ui(UI_HDRS ${UIS}) | ||
| 71 | else() | ||
| 72 | qt4_wrap_ui(UI_HDRS ${UIS}) | ||
| 73 | endif() | ||
| 74 | 70 | ||
| 75 | if (APPLE) | 71 | if (APPLE) |
| 76 | set(MACOSX_ICON "../../dist/yuzu.icns") | 72 | set(MACOSX_ICON "../../dist/yuzu.icns") |