diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-06-14 22:49:07 +0300 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@nextcloud.com> | 2020-12-15 12:57:56 +0300 |
| commit | aad928a6befa13753911bd357d26191d978e1539 (patch) | |
| tree | 4c6bf506eeaeae8ad5fb3a079e9344765f335265 /src/cmd | |
| parent | 919debccfcbe141c3bee5c64ca2502a5cd0c5866 (diff) | |
Install libocsync to lib/ without subfolder.
Installing to lib/${APPLICATION_EXECUTABLE} has caused a bunch of
irritations in the past and subtle annoying to fix bugs. To avoid name
clashes with branded clients ${APPLICATION_EXECUTABLE} becomes now
part of the filename instead of the subfolder.
The concrete motivation to change this now is that on Windows there
is no RPATH and it's not possible to run owncloud directly from the
Craft Root folder, which is nice when you're developing on Windows.
It would have been possible to change this just for Windows but as
written earlier this has caused lots of issues and thus I think it's
a good idea to just stay consistent accross platforms when touching it.
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index abb36205f..47774c987 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -20,13 +20,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") endif() if(NOT BUILD_LIBRARIES_ONLY) - add_executable(${cmd_NAME} ${cmd_SRC}) - set_target_properties(${cmd_NAME} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) - set_target_properties(${cmd_NAME} PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) + add_executable(${cmd_NAME} ${cmd_SRC}) + set_target_properties(${cmd_NAME} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) - target_link_libraries(${cmd_NAME} ocsync ${synclib_NAME} Qt5::Core Qt5::Network) + target_link_libraries(${cmd_NAME} ocsync_${APPLICATION_EXECUTABLE} ${synclib_NAME} Qt5::Core Qt5::Network) # Need tokenizer for netrc parser target_include_directories(${cmd_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/qtokenizer) |