diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2017-11-20 20:00:58 +0300 |
---|---|---|
committer | Tomaz Canabrava <tcanabrava@kde.org> | 2017-11-20 20:00:58 +0300 |
commit | 6d464d9dc63f13ca1a68525adf8ef881292bc557 (patch) | |
tree | 4e3918e8b73e4bb738aa76b0ce2245303c2e6381 /CMakeLists.txt | |
parent | 14aeb6921b118ed85ed6e629f059ac7ce3b9de84 (diff) | |
parent | 2236d05d2512ca84db42ec531159d92d622ff044 (diff) |
Merge branch 'master-nextcloud' into clientSideEncryptionV3
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f862e8b10..8f5eadd60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme") if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake ) include ( ${OEM_THEME_DIR}/OEM.cmake ) else () - include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake ) + include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake ) endif() # need this logic to not mess with re/uninstallations via macosx.pkgproj if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient") @@ -205,7 +205,7 @@ if (NOT DEFINED APPLICATION_ICON_NAME) set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) endif() -include(OwnCloudCPack.cmake) +include(NextcloudCPack.cmake) add_definitions(-DUNICODE) add_definitions(-D_UNICODE) |