Rename resources target

Author: TheOneRing

src/gui/CMakeLists.txt

@@ -176,7 +176,7 @@ set_target_properties(opencloud PROPERTIES
     AUTORCC ON
 )
 apply_common_target_settings(opencloud)
-target_link_libraries(opencloud PUBLIC OpenCloudGui owncloudResources KDAB::kdsingleapplication )
+target_link_libraries(opencloud PUBLIC OpenCloudGui OpenCloudResources KDAB::kdsingleapplication )
 
 MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}")
 

src/gui/folderwizard/CMakeLists.txt

@@ -12,6 +12,6 @@ add_library(folderwizard STATIC
     spacespage.ui
 )
 
-target_link_libraries(folderwizard PUBLIC Qt::Widgets libsync owncloudResources)
+target_link_libraries(folderwizard PUBLIC Qt::Widgets libsync OpenCloudResources)
 set_target_properties(folderwizard PROPERTIES AUTOUIC ON AUTORCC ON)
 apply_common_target_settings(folderwizard)

src/gui/newwizard/CMakeLists.txt

@@ -56,7 +56,7 @@ add_library(newwizard STATIC
 
     setupwizardcontext.cpp
 )
-target_link_libraries(newwizard PUBLIC Qt::Widgets libsync owncloudResources)
+target_link_libraries(newwizard PUBLIC Qt::Widgets libsync OpenCloudResources)
 set_target_properties(newwizard PROPERTIES AUTOUIC ON AUTORCC ON)
 target_include_directories(newwizard PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 apply_common_target_settings(newwizard)

src/libsync/CMakeLists.txt

@@ -83,7 +83,7 @@ set_target_properties(libsync PROPERTIES EXPORT_NAME SyncCore)
 target_link_libraries(libsync
     PUBLIC
         csync
-        owncloudResources
+        OpenCloudResources
         Qt::Core
         Qt::Network
         Qt::Widgets

src/resources/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(owncloudResources SHARED
+add_library(OpenCloudResources SHARED
     client.qrc
     core_theme.qrc
     loadresources.cpp
@@ -8,45 +8,45 @@ add_library(owncloudResources SHARED
     template.cpp
 )
 
-generate_theme(owncloudResources OWNCLOUD_SIDEBAR_ICONS)
+generate_theme(OpenCloudResources OWNCLOUD_SIDEBAR_ICONS)
 
 # make them available to the whole project
 set(OWNCLOUD_SIDEBAR_ICONS ${OWNCLOUD_SIDEBAR_ICONS} CACHE INTERNAL "Sidebar icons" FORCE)
 
-target_link_libraries(owncloudResources PUBLIC Qt::Core Qt::Gui Qt::Quick)
-apply_common_target_settings(owncloudResources)
-target_include_directories(owncloudResources PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>)
-target_compile_definitions(owncloudResources PRIVATE APPLICATION_SHORTNAME="${APPLICATION_SHORTNAME}")
+target_link_libraries(OpenCloudResources PUBLIC Qt::Core Qt::Gui Qt::Quick)
+apply_common_target_settings(OpenCloudResources)
+target_include_directories(OpenCloudResources PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>)
+target_compile_definitions(OpenCloudResources PRIVATE APPLICATION_SHORTNAME="${APPLICATION_SHORTNAME}")
 
-set_target_properties(owncloudResources PROPERTIES
+set_target_properties(OpenCloudResources PROPERTIES
     OUTPUT_NAME "OpenCloudResources"
     AUTOUIC ON
     AUTORCC ON
     VERSION ${MIRALL_VERSION}
     SOVERSION ${MIRALL_SOVERSION}
 )
 
-generate_export_header(owncloudResources
+generate_export_header(OpenCloudResources
         EXPORT_MACRO_NAME OWNCLOUDRESOURCES_EXPORT
         EXPORT_FILE_NAME owncloudresources.h
         STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC
 )
 
 # Handle Translations, pick all client_* files from trans directory.
 file(GLOB client_translations ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
-qt_add_lrelease(owncloudResources TS_FILES ${client_translations} QM_FILES_OUTPUT_VARIABLE client_compiled_translations)
+qt_add_lrelease(OpenCloudResources TS_FILES ${client_translations} QM_FILES_OUTPUT_VARIABLE client_compiled_translations)
 add_resources_to_target(
-    TARGET owncloudResources
+    TARGET OpenCloudResources
     PREFIX translations
     FILES "${client_compiled_translations}"
 )
 
-ecm_add_qml_module(owncloudResources
+ecm_add_qml_module(OpenCloudResources
         URI eu.OpenCloud.resources
         VERSION 1.0
         NAMESPACE OCC
 )
 
-ecm_finalize_qml_module(owncloudResources DESTINATION ${KDE_INSTALL_QMLDIR})
+ecm_finalize_qml_module(OpenCloudResources DESTINATION ${KDE_INSTALL_QMLDIR})
 
-install(TARGETS owncloudResources EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS OpenCloudResources EXPORT ${APPLICATION_SHORTNAME}Config ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

src/resources/loadresources.cpp

@@ -6,7 +6,7 @@ using namespace OCC;
 
 void static load_rc()
 {
-    Q_INIT_RESOURCE(owncloudResources_translations);
+    Q_INIT_RESOURCE(OpenCloudResources_translations);
     Q_INIT_RESOURCE(client);
     Q_INIT_RESOURCE(core_theme);
 #ifdef BRANDING_AVAILABLE
@@ -16,7 +16,7 @@ void static load_rc()
 
 void static unload_rc()
 {
-    Q_CLEANUP_RESOURCE(owncloudResources_translations);
+    Q_CLEANUP_RESOURCE(OpenCloudResources_translations);
     Q_CLEANUP_RESOURCE(client);
     Q_CLEANUP_RESOURCE(core_theme);
 #ifdef BRANDING_AVAILABLE

test/testutils/CMakeLists.txt

@@ -8,4 +8,4 @@ target_compile_definitions(syncenginetestutils PRIVATE TEST_HELPER_EXE="$<TARGET
 # testutilsloader.cpp uses Q_COREAPP_STARTUP_FUNCTION which can't used reliably in a static lib
 # therefore we compile it in the tests
 add_library(testutilsloader OBJECT testutilsloader.cpp)
-target_link_libraries(testutilsloader PUBLIC OpenCloudGui owncloudResources)
+target_link_libraries(testutilsloader PUBLIC OpenCloudGui OpenCloudResources)