status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix static build

This commit is contained in:
Hannah von Reth 2016-12-13 22:06:24 +01:00
parent 96fd4a7914
commit 2bf3e887ee
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -84,7 +84,7 @@ if (SNORE_STATIC_QT)
link_libraries( link_libraries(
"${_qt5Core_install_prefix}/lib/qtharfbuzzng${d}.${SUFFIX}" "${_qt5Core_install_prefix}/lib/qtharfbuzzng${d}.${SUFFIX}"
"${_qt5Core_install_prefix}/lib/qtpcre${d}.${SUFFIX}" "${_qt5Core_install_prefix}/lib/qtpcre${d}.${SUFFIX}"
"${_qt5Core_install_prefix}/lib/qtpng${d}.${SUFFIX}" #"${_qt5Core_install_prefix}/lib/qtpng${d}.${SUFFIX}"
"${_qt5Core_install_prefix}/lib/qtfreetype${d}.${SUFFIX}" "${_qt5Core_install_prefix}/lib/qtfreetype${d}.${SUFFIX}"
"${_qt5Core_install_prefix}/lib/Qt5PlatformSupport${d}.${SUFFIX}" "${_qt5Core_install_prefix}/lib/Qt5PlatformSupport${d}.${SUFFIX}"
"${_qt5Core_install_prefix}/plugins/platforms/qwindows${d}.${SUFFIX}" "${_qt5Core_install_prefix}/plugins/platforms/qwindows${d}.${SUFFIX}"

6
src/libsnore/SnoreAddPlugin.cmake
View File

@ -26,6 +26,12 @@ function(generate_snore_plugin_header)
set(SNORE_RESOURCE_LOADING "${SNORE_RESOURCE_LOADING}\n Q_INIT_RESOURCE(${RESOURCE});") set(SNORE_RESOURCE_LOADING "${SNORE_RESOURCE_LOADING}\n Q_INIT_RESOURCE(${RESOURCE});")
endforeach() endforeach()
configure_file("${PROJECT_SOURCE_DIR}/src/libsnore/snore_static_plugins.h.in" "${PROJECT_BINARY_DIR}/src/libsnore/snore_static_plugins.h") configure_file("${PROJECT_SOURCE_DIR}/src/libsnore/snore_static_plugins.h.in" "${PROJECT_BINARY_DIR}/src/libsnore/snore_static_plugins.h")
add_library(libsnore_static_plugins STATIC)
target_link_libraries(libsnore_static_plugins LINK_PUBLIC ${SNORE_PLUGINS})
add_library(Snore::StaticPlugins ALIAS libsnore_static_plugins)
endfunction() endfunction()
function(add_snore_plugin SNORE_NAME) function(add_snore_plugin SNORE_NAME)

4
src/settings/CMakeLists.txt
View File

@ -2,13 +2,13 @@ ecm_add_app_icon(SNORENOTIFY_SETTINGS_DEPS ICONS ${PROJECT_SOURCE_DIR}/data/128-
add_executable( snoresettings-cli main-cli.cpp settingsutils.cpp ${SNORENOTIFY_SETTINGS_DEPS}) add_executable( snoresettings-cli main-cli.cpp settingsutils.cpp ${SNORENOTIFY_SETTINGS_DEPS})
ecm_mark_nongui_executable(snoresettings-cli) ecm_mark_nongui_executable(snoresettings-cli)
target_link_libraries( snoresettings-cli Snore::Libsnore ${SNORE_PLUGINS}) target_link_libraries( snoresettings-cli Snore::Libsnore Snore::StaticPlugins)
install(TARGETS snoresettings-cli ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS snoresettings-cli ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
if(Qt5Widgets_FOUND) if(Qt5Widgets_FOUND)
qt5_wrap_ui(UI settingswindow.ui) qt5_wrap_ui(UI settingswindow.ui)
add_executable( snoresettings main.cpp settingswindow.cpp settingsutils.cpp ${UI} ${SNORENOTIFY_SETTINGS_DEPS}) add_executable( snoresettings main.cpp settingswindow.cpp settingsutils.cpp ${UI} ${SNORENOTIFY_SETTINGS_DEPS})
target_link_libraries( snoresettings Snore::Libsnore Snore::LibsnoreSettings ${SNORE_PLUGINS}) target_link_libraries( snoresettings Snore::Libsnore Snore::LibsnoreSettings Snore::StaticPlugins)
install(TARGETS snoresettings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS snoresettings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
if(UNIX) if(UNIX)

2
src/snoresend/CMakeLists.txt
View File

@ -1,7 +1,7 @@
ecm_add_app_icon(SNORENOTIFY_SNORESEND_DEPS ICONS ${PROJECT_SOURCE_DIR}/data/128-apps-snore.png) ecm_add_app_icon(SNORENOTIFY_SNORESEND_DEPS ICONS ${PROJECT_SOURCE_DIR}/data/128-apps-snore.png)
add_executable(snoresend main.cpp ${SNORENOTIFY_SNORESEND_DEPS}) add_executable(snoresend main.cpp ${SNORENOTIFY_SNORESEND_DEPS})
target_link_libraries(snoresend Snore::Libsnore ${SNORE_PLUGINS}) target_link_libraries(snoresend Snore::Libsnore Snore::StaticPlugins)
ecm_mark_nongui_executable(snoresend) ecm_mark_nongui_executable(snoresend)
install(TARGETS snoresend ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS snoresend ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})