Visitar URL original
Fix apple build. · gitqueue/client@f3cc614 · GitHub
Skip to content

Commit f3cc614

Browse files
tim-vandecasteeletim-vandecasteele
committed
Fix apple build.
The apple build was broken because the elseif in the CMakeLists is never triggered. Some code was not properly adapted for the new qtmacgoodies. Some paths were not adapted to new split.
1 parent fef37b0 commit f3cc614

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
url = https://github.com/owncloud/documentation
44
[submodule "src/3rdparty/qtmacgoodies"]
55
path = src/3rdparty/qtmacgoodies
6-
url = git://github.com/guruz/qtmacgoodies.git
6+
url = git://github.com/shadone/qtmacgoodies.git
77
[submodule "binary"]
88
path = binary
99
url = git://github.com/owncloud/owncloud-client-binary.git

‎OwnCloudCPack.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(APPLE)
1919
set( CPACK_GENERATOR "DragNDrop" )
2020
set( CPACK_SOURCE_GENERATOR "")
2121
set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
22-
set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/ownCloud.icns)
22+
set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
2323

2424
set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
2525
# set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )

‎src/3rdparty/qtmacgoodies‎

Submodule qtmacgoodies updated from cf09d34 to 10621d4

‎src/gui/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ if (APPLE)
107107
list(APPEND 3rdparty_SRC
108108
../3rdparty/qtmacgoodies/src/macpreferenceswindow.mm
109109
../3rdparty/qtmacgoodies/src/macstandardicon.mm
110+
../3rdparty/qtmacgoodies/src/macwindow.mm
110111
)
111112
endif()
112113

@@ -157,7 +158,7 @@ set( final_src
157158
include( AddAppIconMacro )
158159
set(ownCloud_old ${ownCloud})
159160

160-
# set an icon_app_name. For historical reasons we can not use the
161+
# set an icon_app_name. For historical reasons we can not use the
161162
# application_shortname for ownCloud but must rather set it manually.
162163
if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
163164
set(ICON_APP_NAME ${APPLICATION_SHORTNAME})
@@ -191,7 +192,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
191192
# add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
192193
add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
193194
qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
194-
elseif()
195+
else()
195196
if (Qt5Core_FOUND)
196197
include(DeployQt5)
197198
else(Qt5Core_FOUND)
@@ -232,7 +233,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE}
232233
RUNTIME DESTINATION bin
233234
LIBRARY DESTINATION lib
234235
ARCHIVE DESTINATION lib
235-
BUNDLE DESTINATION "."
236+
BUNDLE DESTINATION bin
236237
)
237238

238239

‎src/gui/owncloudgui.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "progressdispatcher.h"
2121
#include "owncloudsetupwizard.h"
2222
#if defined(Q_OS_MAC)
23-
# include "mirall/settingsdialogmac.h"
23+
# include "settingsdialogmac.h"
2424
# include "macwindow.h" // qtmacgoodies
2525
#else
2626
# include "settingsdialog.h"

0 commit comments

Comments
 (0)