squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 08:48:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6519 from evsh/cmake

Browse Source 
cmake: fix build and add build configurations for Travis
This commit is contained in:
sledgehammer999
2017-04-04 01:24:59 +03:00
committed by GitHub
parent b2528f7573 7d19ee2e59
commit 40948ab652
3 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/CMakeLists.txt
View File

@@ -39,11 +39,7 @@ set(QBT_APP_RESOURCES
# With AUTORCC rcc is ran by cmake before language files are generated,
# and thus we call rcc explicitly
if (QT5)
qt5_add_resources(QBT_APP_RESOURCE_SOURCE ${QBT_APP_RESOURCES})
else (QT5)
qt4_add_resources(QBT_APP_RESOURCE_SOURCE ${QBT_APP_RESOURCES})
endif (QT5)
qt5_add_resources(QBT_APP_RESOURCE_SOURCE ${QBT_APP_RESOURCES})
if (WIN32)
if (MINGW)
@@ -176,6 +172,6 @@ install(TARGETS ${QBT_TARGET_NAME}
BUNDLE DESTINATION .
COMPONENT runtime)
if (APPLE)
if (APPLE AND GUI)
install(SCRIPT ${OSX_RES_SRC_DIR}/bundle.cmake)
endif (APPLE)
endif (APPLE AND GUI)