Rename ocsync library to ${APPLICATION_EXECUTABLE}_csync

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7ac73a3566d0e376a7fa66b8afcca3dcae00372..8e5ddb8850e3c6e03fd72f941bad9f79c80d9883 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,9 @@ if(NOT CRASHREPORTER_EXECUTABLE)
     set(CRASHREPORTER_EXECUTABLE "${APPLICATION_EXECUTABLE}_crash_reporter")
 endif()
 
+set(synclib_NAME "${APPLICATION_EXECUTABLE}sync")
+set(csync_NAME "${APPLICATION_EXECUTABLE}_csync")
+
 include(Warnings)
 
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index dc68d745b6d1ad93cac12361fc499331a362c761..0f44ab2b48232fecb05a592c14632d721b7b2423 100644 (file)
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -389,8 +389,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
    File "${BUILD_PATH}\bin\${APPLICATION_CMD_EXECUTABLE}"
    File "${BUILD_PATH}\bin\lib${APPLICATION_SHORTNAME}sync.dll"
-   ; Yes, with @ ... ${APPLICATION_EXECUTABLE} contains the .exe extension, @APPLICATION_EXECUTABLE@ does not.
-   File "${BUILD_PATH}\bin\libocsync_@APPLICATION_EXECUTABLE@.dll"
+   File "${BUILD_PATH}\bin\lib${APPLICATION_SHORTNAME}_csync.dll"
 
    File "${BUILD_PATH}\src\gui\client*.qm"
    ; Make sure only to copy qt, not qt_help, etc

diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 47774c98744a6cc48ab77c34bb6978e1c929bdbd..f7b6a10a5ae221fbbfbd0683510a26af3371b01b 100644 (file)
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -24,7 +24,7 @@ if(NOT BUILD_LIBRARIES_ONLY)
     set_target_properties(${cmd_NAME} PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
 
-    target_link_libraries(${cmd_NAME} ocsync_${APPLICATION_EXECUTABLE} ${synclib_NAME} Qt5::Core Qt5::Network)
+    target_link_libraries(${cmd_NAME} "${csync_NAME}" "${synclib_NAME}" Qt5::Core Qt5::Network)
 
     # Need tokenizer for netrc parser
     target_include_directories(${cmd_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer)

diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt
index a2ed3e2f36e3ae111737cdbb19c1bbda8039acb4..008eb818a281089928c11ae5c1b94e6e257576b6 100644 (file)
--- a/src/csync/CMakeLists.txt
+++ b/src/csync/CMakeLists.txt
@@ -69,36 +69,35 @@ endif()
 
 configure_file(csync_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/csync_version.h)
 
-set(CSYNC_LIBRARY "ocsync_${APPLICATION_EXECUTABLE}")
-add_library(${CSYNC_LIBRARY} SHARED ${common_SOURCES} ${csync_SRCS})
+add_library("${csync_NAME}" SHARED ${common_SOURCES} ${csync_SRCS})
 
 target_include_directories(
-  ${CSYNC_LIBRARY}
+  "${csync_NAME}"
   PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/std
 )
 
 find_package(SQLite3 3.8.0 REQUIRED)
 if (USE_OUR_OWN_SQLITE3)
     # make sure that the path for the local sqlite3 is before the system one
-    target_include_directories(${CSYNC_LIBRARY} BEFORE PRIVATE ${SQLITE3_INCLUDE_DIR})
+    target_include_directories("${csync_NAME}" BEFORE PRIVATE ${SQLITE3_INCLUDE_DIR})
 else()
-    target_include_directories(${CSYNC_LIBRARY} PRIVATE ${SQLITE3_INCLUDE_DIR})
+    target_include_directories("${csync_NAME}" PRIVATE ${SQLITE3_INCLUDE_DIR})
 endif()
 
 
-generate_export_header(${CSYNC_LIBRARY}
+generate_export_header("${csync_NAME}"
   EXPORT_MACRO_NAME OCSYNC_EXPORT
   EXPORT_FILE_NAME ocsynclib.h
 )
 
-target_link_libraries(${CSYNC_LIBRARY}
+target_link_libraries("${csync_NAME}"
   ${CSYNC_REQUIRED_LIBRARIES}
   ${SQLITE3_LIBRARIES}
   Qt5::Core Qt5::Concurrent
 )
 
 if(ZLIB_FOUND)
-  target_link_libraries(${CSYNC_LIBRARY} ZLIB::ZLIB)
+  target_link_libraries("${csync_NAME}" ZLIB::ZLIB)
 endif(ZLIB_FOUND)
 
 
@@ -106,11 +105,11 @@ endif(ZLIB_FOUND)
 if (APPLE)
     find_library(FOUNDATION_LIBRARY NAMES Foundation)
     find_library(CORESERVICES_LIBRARY NAMES CoreServices)
-    target_link_libraries(${CSYNC_LIBRARY} ${FOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY})
+    target_link_libraries("${csync_NAME}" ${FOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY})
 endif()
 
 set_target_properties(
-  ${CSYNC_LIBRARY}
+  "${csync_NAME}"
     PROPERTIES
       VERSION
         ${LIBRARY_VERSION}
@@ -122,7 +121,7 @@ set_target_properties(
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
   INSTALL(
     TARGETS
-      ${CSYNC_LIBRARY}
+    "${csync_NAME}"
     LIBRARY DESTINATION
        ${LIB_INSTALL_DIR}
     ARCHIVE DESTINATION
@@ -133,7 +132,7 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE)
 else()
   INSTALL(
   TARGETS
-    ${CSYNC_LIBRARY}
+  "${csync_NAME}"
   LIBRARY DESTINATION
     ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 2ac92fba0b7597d71d45ae495c40735fc174ad52..ee08c83ace82b839361ef1c81665222818541257 100644 (file)
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -94,7 +94,7 @@ ENDIF(NOT APPLE)
 
 add_library(${synclib_NAME} SHARED ${libsync_SRCS})
 target_link_libraries(${synclib_NAME}
-    ocsync_${APPLICATION_EXECUTABLE}
+    "${csync_NAME}"
     OpenSSL::Crypto
     OpenSSL::SSL
     ${OS_SPECIFIC_LINK_LIBRARIES}

diff --git a/test/csync/CMakeLists.txt b/test/csync/CMakeLists.txt
index d75361b025dd01cb4c78ba8d1a0a437b97d7441a..4e9c1422c339cda11a1c5b9840f106f68729cbeb 100644 (file)
--- a/test/csync/CMakeLists.txt
+++ b/test/csync/CMakeLists.txt
@@ -11,9 +11,9 @@ include_directories(
 include_directories(${CHECK_INCLUDE_DIRS})
 # create test library
 add_library(${TORTURE_LIBRARY} STATIC torture.c cmdline.c)
-target_link_libraries(${TORTURE_LIBRARY} ${CMOCKA_LIBRARIES} ${CSYNC_LIBRARY})
+target_link_libraries(${TORTURE_LIBRARY} ${CMOCKA_LIBRARIES})
 
-set(TEST_TARGET_LIBRARIES ${TORTURE_LIBRARY} Qt5::Core ocsync_${APPLICATION_EXECUTABLE})
+set(TEST_TARGET_LIBRARIES ${TORTURE_LIBRARY} Qt5::Core "${csync_NAME}")
 
 # create tests