Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.1:Update
snorenotify-qt5
fix_lib_suffix.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix_lib_suffix.patch of Package snorenotify-qt5
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7f0343..e2c7880 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,8 +72,8 @@ set(SNORE_PLUGIN_INSTALL_PATH LIBRARY DESTINATION ${LIBSNORE_PLUGIN_PATH}) add_definitions(-DLIBSNORE_PLUGIN_PATH="${LIBSNORE_FULL_PLUGIN_PATH}" -DSNORE_SUFFIX="${SNORE_SUFFIX}") message(STATUS "Installing plugins to ${LIBSNORE_PLUGIN_PATH}") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +unset(CMAKE_LIBRARY_OUTPUT_DIRECTORY) +unset(CMAKE_RUNTIME_OUTPUT_DIRECTORY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 19bb9b3..6b5b51b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,9 +7,9 @@ if(WITH_SNORE_DEAMON) add_executable( snorenotify WIN32 main.cpp snorenotify.cpp trayicon.cpp ${SNORENOTIFY_DEAMON_DEPS}) target_link_libraries( snorenotify libsnore ${QT_QTGUI_LIBRARY} ) - install(TARGETS snorenotify RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + install(TARGETS snorenotify RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") endif() add_subdirectory(plugins) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 102afdf..507d7c3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -42,7 +42,7 @@ set ( SnoreNotify_HDR ${SnoreNotify_HDR} add_library( libsnore SHARED ${SnoreNotify_SRCS}) set_target_properties( libsnore PROPERTIES OUTPUT_NAME "snore${SNORE_SUFFIX}" - VERSION "${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}.${SNORE_VERSION_SUFFIX}" + VERSION "${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}" SOVERSION "${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}" EXPORT_NAME Libsnore) target_link_libraries( libsnore PUBLIC ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) @@ -62,13 +62,13 @@ $<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include/snore/core>) install(TARGETS libsnore EXPORT LibsnoreTarget - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") -install(EXPORT LibsnoreTarget DESTINATION lib/cmake/libsnore${SNORE_CamelCase_SUFFIX} NAMESPACE Snore::) +install(EXPORT LibsnoreTarget DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libsnore${SNORE_CamelCase_SUFFIX} NAMESPACE Snore::) install(FILES ${SnoreNotify_HDR} DESTINATION include/snore/core) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake DESTINATION lib/cmake/libsnore${SNORE_CamelCase_SUFFIX}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libsnore${SNORE_CamelCase_SUFFIX}) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 7ea31e5..c3531e6 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_SHARED_MODULE_PREFIX) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/libsnore${SNORE_SUFFIX}") +unset(CMAKE_LIBRARY_OUTPUT_DIRECTORY) add_subdirectory(backends) add_subdirectory(frontends)
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