mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-29 12:19:03 +03:00
Properly install cmake in OS X app bundle
This commit is contained in:
parent
528d434c1f
commit
93db6ca6ab
2 changed files with 10 additions and 7 deletions
|
@ -59,6 +59,8 @@ set(DATADIR ${DATA_INSTALL_DIR})
|
||||||
if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
|
if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
|
||||||
set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
|
set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
|
||||||
set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
|
set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
|
||||||
|
set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
|
||||||
|
set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
|
||||||
|
|
||||||
# BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
|
# BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
|
||||||
elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
|
elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
|
||||||
|
|
|
@ -47,10 +47,11 @@ INSTALL(
|
||||||
${BIN_INSTALL_DIR}
|
${BIN_INSTALL_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (NOT APPLE)
|
||||||
INSTALL(
|
INSTALL(
|
||||||
FILES
|
FILES
|
||||||
${httpbf_HEADERS}
|
${httpbf_HEADERS}
|
||||||
DESTINATION
|
DESTINATION
|
||||||
${CMAKE_INSTALL_INCLUDEDIR}
|
${CMAKE_INSTALL_INCLUDEDIR}
|
||||||
)
|
)
|
||||||
|
endif (BUILD_OWNCLOUD_OSX_BUNDLE)
|
||||||
|
|
Loading…
Reference in a new issue