Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
authorNicolas Fella <nicolas.fella@gmx.de>2021-04-13 13:39:10 +0300
committerMatthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr>2021-08-19 13:30:23 +0300
commit43cccb0a7356f7d4b9e49af505fc40243c93e78c (patch)
treeea78c25ce11daa97960ecea5a3996e457b9b4a4e /src/cmd
parent3d5d78f7a7ab200425b1433d556ea687d8a16494 (diff)
Don't use variables for CMake target identifiers
This makes the code a bit nicer to read and maybe a bit more robust. Set the relevant OUTPUT_NAME target properties to keep the ability to customize the names of the installed binaries. Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/CMakeLists.txt19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 81c2460e0..37d3c5255 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -1,14 +1,11 @@
project(cmd)
set(CMAKE_AUTOMOC TRUE)
-set(cmd_NAME ${APPLICATION_EXECUTABLE}cmd)
-
add_library(cmdCore STATIC simplesslerrorhandler.cpp netrcparser.cpp)
target_link_libraries(cmdCore
PUBLIC
- "${csync_NAME}"
- "${synclib_NAME}"
+ nextcloudsync
Qt5::Core
Qt5::Network
)
@@ -27,20 +24,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
endif()
if(NOT BUILD_LIBRARIES_ONLY)
- add_executable(${cmd_NAME} cmd.cpp)
+ add_executable(nextcloudcmd cmd.cpp)
+ set_target_properties(nextcloudcmd PROPERTIES
+ RUNTIME_OUTPUT_NAME "${APPLICATION_EXECUTABLE}cmd")
+
+ target_link_libraries(nextcloudcmd cmdCore)
if(BUILD_OWNCLOUD_OSX_BUNDLE)
- set_target_properties(${cmd_NAME} PROPERTIES
+ set_target_properties(nextcloudcmd PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${BIN_OUTPUT_DIRECTORY}/${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS")
else()
- set_target_properties(${cmd_NAME} PROPERTIES
+ set_target_properties(nextcloudcmd PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
- install(TARGETS ${cmd_NAME}
+ install(TARGETS nextcloudcmd
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
-
- target_link_libraries(${cmd_NAME} cmdCore)
endif()