Ver código fonte

use alias target for internal libraries

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Matthieu Gallien 4 anos atrás
pai
commit
833237b2e4

+ 1 - 1
src/cmd/CMakeLists.txt

@@ -5,7 +5,7 @@ add_library(cmdCore STATIC simplesslerrorhandler.cpp netrcparser.cpp)
 
 target_link_libraries(cmdCore
   PUBLIC
-  nextcloudsync
+  Nextcloud::sync
   Qt5::Core
   Qt5::Network
   )

+ 1 - 0
src/csync/CMakeLists.txt

@@ -59,6 +59,7 @@ endif()
 configure_file(csync_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/csync_version.h)
 
 add_library(nextcloud_csync SHARED ${common_SOURCES} ${csync_SRCS})
+add_library(Nextcloud::csync ALIAS nextcloud_csync)
 
 target_include_directories(
   nextcloud_csync

+ 2 - 2
src/gui/CMakeLists.txt

@@ -331,7 +331,7 @@ add_library(nextcloudCore STATIC ${final_src})
 
 target_link_libraries(nextcloudCore
   PUBLIC
-  nextcloudsync
+  Nextcloud::sync
   Qt5::Widgets
   Qt5::GuiPrivate
   Qt5::Svg
@@ -418,7 +418,7 @@ endif()
 
 IF(BUILD_UPDATER)
     add_library(updater STATIC ${updater_SRCS})
-    target_link_libraries(updater nextcloudsync ${updater_DEPS} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml)
+    target_link_libraries(updater Nextcloud::sync ${updater_DEPS} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml)
     target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
     set_target_properties(updater PROPERTIES AUTOMOC ON)
     target_link_libraries(nextcloudCore PUBLIC updater)

+ 3 - 1
src/libsync/CMakeLists.txt

@@ -103,11 +103,13 @@ IF (NOT APPLE)
 ENDIF(NOT APPLE)
 
 find_package(Qt5 REQUIRED COMPONENTS WebSockets)
+
 add_library(nextcloudsync SHARED ${libsync_SRCS})
+add_library(Nextcloud::sync ALIAS nextcloudsync)
 
 target_link_libraries(nextcloudsync
   PUBLIC
-  nextcloud_csync
+  Nextcloud::csync
   OpenSSL::Crypto
   OpenSSL::SSL
   ${OS_SPECIFIC_LINK_LIBRARIES}

+ 1 - 1
src/libsync/vfs/cfapi/CMakeLists.txt

@@ -8,7 +8,7 @@ if (WIN32)
     )
 
     target_link_libraries(nextcloudsync_vfs_cfapi PRIVATE
-        nextcloudsync
+        Nextcloud::sync
         cldapi
     )
 

+ 1 - 1
src/libsync/vfs/suffix/CMakeLists.txt

@@ -2,7 +2,7 @@ add_library(nextcloudsync_vfs_suffix SHARED
     vfs_suffix.cpp
 )
 
-target_link_libraries(nextcloudsync_vfs_suffix PRIVATE nextcloudsync)
+target_link_libraries(nextcloudsync_vfs_suffix PRIVATE Nextcloud::sync)
 
 set_target_properties(nextcloudsync_vfs_suffix
   PROPERTIES

+ 1 - 1
src/libsync/vfs/xattr/CMakeLists.txt

@@ -8,7 +8,7 @@ if (LINUX)
         ${vfs_xattr_SRCS}
     )
 
-    target_link_libraries(nextcloudsync_vfs_xattr PRIVATE nextcloudsync)
+    target_link_libraries(nextcloudsync_vfs_xattr PRIVATE Nextcloud::sync)
 
     set_target_properties(nextcloudsync_vfs_xattr
       PROPERTIES

+ 1 - 1
test/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library(testutils
   testhelper.cpp
 )
 
-target_link_libraries(testutils PUBLIC nextcloudsync Qt5::Test)
+target_link_libraries(testutils PUBLIC Nextcloud::sync Qt5::Test)
 target_include_directories(testutils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 set_target_properties(testutils PROPERTIES FOLDER Tests)
 

+ 1 - 1
test/csync/CMakeLists.txt

@@ -14,7 +14,7 @@ include_directories(
 add_library(${TORTURE_LIBRARY} STATIC torture.c cmdline.c)
 target_link_libraries(${TORTURE_LIBRARY} ${CMOCKA_LIBRARIES})
 
-set(TEST_TARGET_LIBRARIES ${TORTURE_LIBRARY} Qt5::Core nextcloud_csync)
+set(TEST_TARGET_LIBRARIES ${TORTURE_LIBRARY} Qt5::Core Nextcloud::csync)
 
 # create tests
 

+ 2 - 2
test/nextcloud_add_test.cmake

@@ -9,7 +9,7 @@ macro(nextcloud_add_test test_class)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Test PRIVATE
-      nextcloudsync
+      Nextcloud::sync
       testutils
       nextcloudCore
       cmdCore
@@ -58,7 +58,7 @@ macro(nextcloud_add_benchmark test_class)
     set_target_properties(${OWNCLOUD_TEST_CLASS}Bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
 
     target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
-      nextcloudsync
+      Nextcloud::sync
       testutils
       nextcloudCore
       cmdCore