Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:kill_it:megasync
megasync
dont-override-install-path.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File dont-override-install-path.patch of Package megasync
diff --git a/contrib/cmake/modules/desktopapp_configuration.cmake b/contrib/cmake/modules/desktopapp_configuration.cmake index 8e9f35cb..9f797c28 100644 --- a/contrib/cmake/modules/desktopapp_configuration.cmake +++ b/contrib/cmake/modules/desktopapp_configuration.cmake @@ -29,8 +29,8 @@ if(UNIX AND NOT APPLE) # Note: using cmake --install --prefix /some/prefix will keep the RPATH as configured above. # Used for building packages: in which install dir is a path construction folder that will not be there in packages - set(CMAKE_INSTALL_LIBDIR "opt/megasync/lib") # override default "lib" from GNUInstallDirs - set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs +# set(CMAKE_INSTALL_LIBDIR "opt/megasync/lib") # override default "lib" from GNUInstallDirs +# set(CMAKE_INSTALL_BINDIR "usr/bin") # override default "bin" from GNUInstallDirs # Override CMAKE_INSTALL_PREFIX if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # In consecutive runs it will always be undef/false @@ -38,7 +38,7 @@ if(UNIX AND NOT APPLE) set(CMAKE_INSTALL_PREFIX "" CACHE PATH "" FORCE) # Set value in cache for consecutive runs endif() - list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +# list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") message(STATUS "Current installation path for ${PROJECT_NAME} project: \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/src/MEGASync/CMakeLists.txt b/src/MEGASync/CMakeLists.txt index fa88bef0..1a371546 100644 --- a/src/MEGASync/CMakeLists.txt +++ b/src/MEGASync/CMakeLists.txt @@ -161,19 +161,19 @@ if (UNIX AND NOT APPLE) install(TARGETS MEGAsync RUNTIME) # In CMAKE_INSTALL_LIBDIR directory - set(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/$<$<CONFIG:Debug>:debug/>lib/") - - install(DIRECTORY "${vcpkg_lib_folder}" - TYPE LIB # In CMAKE_INSTALL_LIBDIR directory - FILES_MATCHING - PATTERN "*.so*" - PATTERN "manual-link" EXCLUDE - PATTERN "pkgconfig" EXCLUDE - ) - - if(DEPLOY_QT_LIBRARIES) - include(desktopapp_deploy_qt) - endif() +# set(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/$<$<CONFIG:Debug>:debug/>lib/") + +# install(DIRECTORY "${vcpkg_lib_folder}" +# TYPE LIB # In CMAKE_INSTALL_LIBDIR directory +# FILES_MATCHING +# PATTERN "*.so*" +# PATTERN "manual-link" EXCLUDE +# PATTERN "pkgconfig" EXCLUDE +# ) + +# if(DEPLOY_QT_LIBRARIES) +# include(desktopapp_deploy_qt) +# endif() endif()
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor