Theme locations

* WIN theme stuff
* OSX theme stuff

nextcloudtheme/OEM.cmake

@@ -6,9 +6,9 @@ set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string
 
 set( THEME_CLASS            "NextcloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
-set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
+set( WIN_SETUP_BITMAP_PATH  "${OEM_THEME_DIR}/win" )
 
-set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
+set( MAC_INSTALLER_BACKGROUND_FILE "${OEM_THEME_DIR}/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
 
 set( THEME_INCLUDE          "${OEM_THEME_DIR}/nextcloudtheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
@@ -16,3 +16,7 @@ set( THEME_INCLUDE          "${OEM_THEME_DIR}/nextcloudtheme.h" )
 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
 set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
+
+if(CPACK_GENERATOR MATCHES "NSIS")
+    SET( CPACK_PACKAGE_ICON  "{OEM_THEME_DIR}/win/installer.ico" ) # Set installer icon
+endif(CPACK_GENERATOR MATCHES "NSIS")