FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy only needed dlls.

Browse Source
This commit is contained in:
Martin Rotter 2016-04-01 12:23:08 +02:00
parent 8f62904a34
commit 27d892cb71
2 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
CMakeLists.txt
View File

@ -171,7 +171,7 @@ endif(UNIX)
configure_file ( configure_file (
${PROJECT_SOURCE_DIR}/src/definitions/definitions.h.in ${PROJECT_SOURCE_DIR}/src/definitions/definitions.h.in
${CMAKE_BINARY_DIR}/src/definitions/definitions.h ${CMAKE_BINARY_DIR}/src/definitions/definitions.h
) )
# Define some useful DEBUG for, ehrm, debug build. # Define some useful DEBUG for, ehrm, debug build.
if(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE") if(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE")
@ -183,15 +183,15 @@ else(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release"
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
# Enable compiler warnings. # Enable compiler warnings.
# See http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake # See http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
message(STATUS "[${APP_LOW_NAME}] Enabling verbose makefile and full warning reports.") message(STATUS "[${APP_LOW_NAME}] Enabling verbose makefile and full warning reports.")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-pedantic -Wall) # -Wextra -Wno-unused-variable add_definitions(-pedantic -Wall) # -Wextra -Wno-unused-variable
endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
# Verbose compiling outputs. # Verbose compiling outputs.
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
endif(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE") endif(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE")
# Force Qt to use string builders. # Force Qt to use string builders.
@ -302,7 +302,7 @@ file( GLOB APP_SOURCES_GL
set(APP_SOURCES set(APP_SOURCES
${APP_SOURCES} ${APP_SOURCES}
${APP_SOURCES_GL} ${APP_SOURCES_GL}
) )
# APP headers. # APP headers.
file( GLOB APP_HEADERS file( GLOB APP_HEADERS
@ -352,6 +352,12 @@ if(WIN32)
file( GLOB APP_DLLS_QT5_MSVC2013 file( GLOB APP_DLLS_QT5_MSVC2013
"resources/binaries/windows/qt5-msvc2013/*.dll") "resources/binaries/windows/qt5-msvc2013/*.dll")
file( GLOB APP_DLLS_QT5_MSVC2013_BEARER
"resources/binaries/windows/qt5-msvc2013/bearer/*.dll")
file( GLOB APP_DLLS_QT5_MSVC2013_ICONENGINES
"resources/binaries/windows/qt5-msvc2013/iconengines/*.dll")
file( GLOB APP_DLLS_QT5_MSVC2013_IMAGEFORMATS file( GLOB APP_DLLS_QT5_MSVC2013_IMAGEFORMATS
"resources/binaries/windows/qt5-msvc2013/imageformats/*.dll") "resources/binaries/windows/qt5-msvc2013/imageformats/*.dll")
@ -360,9 +366,6 @@ if(WIN32)
file( GLOB APP_DLLS_QT5_MSVC2013_PLATFORMS file( GLOB APP_DLLS_QT5_MSVC2013_PLATFORMS
"resources/binaries/windows/qt5-msvc2013/platforms/*.dll") "resources/binaries/windows/qt5-msvc2013/platforms/*.dll")
file( GLOB APP_DLLS_QT5_MSVC2013_PRINTSUPPORT
"resources/binaries/windows/qt5-msvc2013/printsupport/*.dll")
endif(WIN32) endif(WIN32)
# Add custom icon on Mac OS X. # Add custom icon on Mac OS X.
@ -390,7 +393,7 @@ include_directories (
${CMAKE_SOURCE_DIR}/src/network-web ${CMAKE_SOURCE_DIR}/src/network-web
${CMAKE_SOURCE_DIR}/src/dynamic-shortcuts ${CMAKE_SOURCE_DIR}/src/dynamic-shortcuts
${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src
) )
# Compile "rssguard" # Compile "rssguard"
add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
@ -398,7 +401,7 @@ add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
${APP_FORMS} ${APP_FORMS}
${APP_RCC} ${APP_RCC}
${APP_QM} ${APP_QM}
) )
if(WIN32) if(WIN32)
target_link_libraries(${EXE_NAME} Qt5::WinMain) target_link_libraries(${EXE_NAME} Qt5::WinMain)
@ -416,7 +419,7 @@ if(UNIX)
PrintSupport PrintSupport
) )
else(UNIX) else(UNIX)
# Use modules from Qt. # Use modules from Qt.
qt5_use_modules(${EXE_NAME} qt5_use_modules(${EXE_NAME}
Core Core
Widgets Widgets
@ -435,10 +438,11 @@ if(WIN32)
# Copy DLLs and other binary files for main installation. # Copy DLLs and other binary files for main installation.
if(WIN32) if(WIN32)
install(FILES ${APP_DLLS_QT5_MSVC2013} DESTINATION ./) install(FILES ${APP_DLLS_QT5_MSVC2013} DESTINATION ./)
install(FILES ${APP_DLLS_QT5_MSVC2013_BEARER} DESTINATION ./bearer)
install(FILES ${APP_DLLS_QT5_MSVC2013_ICONENGINES} DESTINATION ./iconengines)
install(FILES ${APP_DLLS_QT5_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats) install(FILES ${APP_DLLS_QT5_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats)
install(FILES ${APP_DLLS_QT5_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
install(FILES ${APP_DLLS_QT5_MSVC2013_PLATFORMS} DESTINATION ./platforms) install(FILES ${APP_DLLS_QT5_MSVC2013_PLATFORMS} DESTINATION ./platforms)
install(FILES ${APP_DLLS_QT5_MSVC2013_PRINTSUPPORT} DESTINATION ./printsupport) install(FILES ${APP_DLLS_QT5_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
endif(WIN32) endif(WIN32)
install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons) install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons)
@ -546,30 +550,30 @@ set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_VENDOR ${APP_AUTHOR}) set(CPACK_PACKAGE_VENDOR ${APP_AUTHOR})
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APP_NAME}) set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APP_NAME})
set(CPACK_IGNORE_FILES "/resources/aur/;\\\\.psd$;/resources/deployment;/CVS/;/\\\\.svn/;/\\\\.git/;\\\\.swp$;/CMakeLists.txt.user;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt;\\\\.qm$;/build/;\\\\.diff$;.DS_Store'") set(CPACK_IGNORE_FILES "/resources/aur/;\\\\.psd$;/resources/deployment;/CVS/;/\\\\.svn/;/\\\\.git/;\\\\.swp$;/CMakeLists.txt.user;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt;\\\\.qm$;/build/;\\\\.diff$;.DS_Store'")
set(CPACK_SOURCE_GENERATOR "TGZ") set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
set(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES}) set(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES})
set(CPACK_NSIS_INSTALLED_ICON_NAME "${APP_LOW_NAME}.ico") set(CPACK_NSIS_INSTALLED_ICON_NAME "${APP_LOW_NAME}.ico")
set(CPACK_NSIS_HELP_LINK ${APP_URL}) set(CPACK_NSIS_HELP_LINK ${APP_URL})
set(CPACK_NSIS_URL_INFO_ABOUT ${APP_URL}) set(CPACK_NSIS_URL_INFO_ABOUT ${APP_URL})
set(CPACK_NSIS_CONTACT ${APP_EMAIL}) set(CPACK_NSIS_CONTACT ${APP_EMAIL})
# Load packaging facilities. # Load packaging facilities.
include(CPack) include(CPack)
# Configure file with custom definitions for NSIS. # Configure file with custom definitions for NSIS.
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/resources/nsis/NSIS.definitions.nsh.in ${CMAKE_CURRENT_SOURCE_DIR}/resources/nsis/NSIS.definitions.nsh.in
${CMAKE_CURRENT_BINARY_DIR}/resources/nsis/NSIS.definitions.nsh ${CMAKE_CURRENT_BINARY_DIR}/resources/nsis/NSIS.definitions.nsh
) )
# make dist implementation. # make dist implementation.
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
# make lupdate implementation. # make lupdate implementation.
add_custom_target(lupdate add_custom_target(lupdate
${Qt5Core_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro ${Qt5Core_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
COMMAND ${Qt5_LUPDATE_EXECUTABLE} -no-obsolete -ts ${APP_TRANSLATIONS_WO_QT} -pro ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro COMMAND ${Qt5_LUPDATE_EXECUTABLE} -no-obsolete -ts ${APP_TRANSLATIONS_WO_QT} -pro ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
) )

2
resources/binaries

@ -1 +1 @@
Subproject commit 9ac6aeabaae34afe02602f51dae7fc181aff49dd Subproject commit 2392b936c08eac92a6a34361a916a739f53836d0