diff options
| author | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:27 -0400 |
|---|---|---|
| committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:27 -0400 |
| commit | dd2f7ce46df53f2c377c02d1bf4df8adcf092072 (patch) | |
| tree | 51d4bd5d66a45a24784695c4e99b452b417dc3d1 /CMakeLists.txt | |
| parent | b954e6dbcceaba3b50aca624e1bddc6db4830829 (diff) | |
Imported Upstream version 2.3
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c0fff2..e91ccfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,14 @@ PROJECT(bibletime CXX C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) #Version -ADD_DEFINITIONS(-DBT_VERSION="2.2") +ADD_DEFINITIONS(-DBT_VERSION="2.3") #Non-English locales to be processed and installed for UI, handbook and howto LIST(APPEND MESSAGE_LOCALE_LANGS af bg cs da de en_GB es et fi fr hu it ko nl nn_NO no pl pt_br ro ru sk sv ua vi zh_CN zh_TW) #WARNING: If you modify HANDBOOK_LOCALE_LANGS or HOWTO_LOCALE_LANGS, #also modify the po4a conf files in cmake/docs/ to make sure all languages are processed. LIST(APPEND HANDBOOK_LOCALE_LANGS cs de fi fr hu nl pt-br) -LIST(APPEND HOWTO_LOCALE_LANGS bg cs de fi fr it hu ko nl pt-br ru) +LIST(APPEND HOWTO_LOCALE_LANGS bg cs da de es fi fr it hu ko nl pt-br ru) ###################################################### # Find required packages @@ -306,7 +306,7 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/c SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows Beta") SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info") SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "2") +SET(CPACK_PACKAGE_VERSION_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime") @@ -321,9 +321,8 @@ IF(WIN32 AND NOT UNIX) # We need the libraries, and they're not pulled in automatically INCLUDE(${QT_USE_FILE}) - IF(NOT CMAKE_BUILD_TYPE STREQUAL "Release") - SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE) - INSTALL(FILES + SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE) + INSTALL(FILES "${QT_LIBRARY_DIR}/QtWebKitd4.dll" "${QT_LIBRARY_DIR}/QtGuid4.dll" "${QT_LIBRARY_DIR}/QtXmld4.dll" @@ -333,18 +332,20 @@ IF(WIN32 AND NOT UNIX) "${QT_LIBRARY_DIR}/phonond4.dll" "${QT_LIBRARY_DIR}/QtSvgd4.dll" DESTINATION "${BT_DESTINATION}" - ) - ELSE(NOT CMAKE_BUILD_TYPE STREQAL "Release") - INSTALL(FILES + CONFIGURATIONS "Debug" + ) + INSTALL(FILES "${QT_LIBRARY_DIR}/QtWebKit4.dll" "${QT_LIBRARY_DIR}/QtGui4.dll" "${QT_LIBRARY_DIR}/QtXml4.dll" + "${QT_LIBRARY_DIR}/QtTest4.dll" "${QT_LIBRARY_DIR}/QtNetwork4.dll" "${QT_LIBRARY_DIR}/QtCore4.dll" "${QT_LIBRARY_DIR}/phonon4.dll" "${QT_LIBRARY_DIR}/QtSvg4.dll" - DESTINATION "${BT_DESTINATION}") - ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release") + DESTINATION "${BT_DESTINATION}" + CONFIGURATIONS "Release" + ) # Qt Plugins INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats" DESTINATION "${BT_DESTINATION}/plugins") @@ -355,7 +356,7 @@ IF(WIN32 AND NOT UNIX) INSTALL(FILES ${SWORD_DLL} DESTINATION ${BT_DESTINATION}) # This will also take effect in the regular install # Some options for the CPack system. These should be pretty self-evident - SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons\\\\bibletime.png") + SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\pics\\\\icons\\\\bibletime.png") SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\bibletime.exe") SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} for Windows") SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.bibletime.info") |