diff options
author | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:25 -0400 |
---|---|---|
committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:25 -0400 |
commit | b954e6dbcceaba3b50aca624e1bddc6db4830829 (patch) | |
tree | 31fa8e2579585c9626d56bc9beb55326cbd40ff2 /CMakeLists.txt | |
parent | 04e7ba8bf082e2b170595eef488834accd9d946e (diff) |
Imported Upstream version 2.2
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e2f052b..1c0fff2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,14 @@ PROJECT(bibletime CXX C) -CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) #Version -ADD_DEFINITIONS(-DBT_VERSION=\\\"2.0.1\\\") +ADD_DEFINITIONS(-DBT_VERSION="2.2") #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) +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) ###################################################### @@ -92,10 +92,10 @@ IF (CMAKE_BUILD_TYPE STREQUAL "Release") # this will run moc on source files QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS}) ADD_EXECUTABLE(${EXECUTABLE_NAME} ${bibletime_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES}) - SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} - PROPERTIES - COMPILE_FLAGS "${SWORD_CFLAGS}" #Enable exception handling - ) +# SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} +# PROPERTIES +# COMPILE_FLAGS "${SWORD_CFLAGS}" #Enable exception handling +# ) INCLUDE(${QT_USE_FILE}) TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${QT_LIBRARIES} @@ -115,7 +115,7 @@ ELSE (CMAKE_BUILD_TYPE STREQUAL "Release") ${bibletime_test_SOURCES} ${bibletime_UIS_H} ${bibletime_MOC_SOURCES} ${bibletime_test_MOC_SOURCES}) SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} PROPERTIES - COMPILE_FLAGS "-DBT_ENABLE_TESTING ${SWORD_CFLAGS}" #Enable exception handling and Testing + COMPILE_FLAGS "-DBT_ENABLE_TESTING" #Enable exception handling and Testing ) SET(QT_USE_QTTEST 1) INCLUDE(${QT_USE_FILE}) @@ -148,11 +148,11 @@ IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) IF (MSVC) - SET(CMAKE_CXX_FLAGS_RELEASE "${SWORD_CFLAGS} -DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MD /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE ") - SET(CMAKE_CXX_FLAGS_DEBUG "${SWORD_CFLAGS} -DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE -DBT_ENABLE_TESTING /ZI") + SET(CMAKE_CXX_FLAGS_RELEASE "-DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MD /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE ") + SET(CMAKE_CXX_FLAGS_DEBUG "-DNO_DBUS -DSWUSINGDLL -DBT_VERSION=\\\"${BT_VERSION}\\\" /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE -DBT_ENABLE_TESTING /ZI") ELSE (MSVC) - SET(CMAKE_CXX_FLAGS_RELEASE "-W -O2 -fexceptions ${SWORD_CFLAGS} ") - SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -O0 -g -fexceptions ${SWORD_CFLAGS} -DBT_ENABLE_TESTING") + SET(CMAKE_CXX_FLAGS_RELEASE "-W -O2 -fexceptions") + SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror -O0 -g -fexceptions -DBT_ENABLE_TESTING") ENDIF (MSVC) @@ -306,8 +306,8 @@ 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 "0") -SET(CPACK_PACKAGE_VERSION_PATCH "1") +SET(CPACK_PACKAGE_VERSION_MINOR "2") +SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime") ###################################################### @@ -346,6 +346,9 @@ IF(WIN32 AND NOT UNIX) DESTINATION "${BT_DESTINATION}") ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release") + # Qt Plugins + INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats" DESTINATION "${BT_DESTINATION}/plugins") + # This adds in the required Windows system libraries and libsword.dll INCLUDE(InstallRequiredSystemLibraries) STRING(REPLACE ".lib" ".dll" SWORD_DLL "${SWORD_LIBRARY}") @@ -378,10 +381,20 @@ ELSEIF(APPLE) DESTINATION "${BT_DESTINATION}/../Library/Frameworks/") ENDFOREACH(QT_FRAME ${QT_FRAMEWORKS_USED}) # Other libraries I need - INSTALL(FILES "${CLUCENE_LIBRARY}" "${CLUCENE_LIBRARY_DIR}/libclucene.0.0.0.dylib" "${CLUCENE_LIBRARY_DIR}/libclucene.0.dylib" "/opt/local/lib/libcurl.4.dylib" - "/opt/local/lib/libssl.0.9.8.dylib" "/opt/local/lib/libcrypto.0.9.8.dylib" #"/opt/local/lib/libicui18n.40.dylib" "/opt/local/lib/libicui18n.40.0.dylib" - #"/opt/local/lib/libicuuc.40.dylib" "/opt/local/lib/libicuuc.40.0.dylib" "/opt/local/lib/libicuio.40.dylib" "/opt/local/lib/libicuio.40.0.dylib" - #"/opt/local/lib/libicudata.40.dylib" "/opt/local/lib/libicudata.40.0.dylib" + INSTALL(FILES "${CLUCENE_LIBRARY}" + "${CLUCENE_LIBRARY_DIR}/libclucene.0.0.0.dylib" + "${CLUCENE_LIBRARY_DIR}/libclucene.0.dylib" + "/opt/local/lib/libcurl.4.dylib" + "/opt/local/lib/libssl.0.9.8.dylib" + "/opt/local/lib/libcrypto.0.9.8.dylib" + "/opt/local/lib/libicui18n.40.dylib" + "/opt/local/lib/libicui18n.40.0.dylib" + "/opt/local/lib/libicuuc.40.dylib" + "/opt/local/lib/libicuuc.40.0.dylib" + "/opt/local/lib/libicuio.40.dylib" + "/opt/local/lib/libicuio.40.0.dylib" + "/opt/local/lib/libicudata.40.dylib" + "/opt/local/lib/libicudata.40.0.dylib" "/opt/local/lib/libpng12.0.dylib" DESTINATION "${BT_DESTINATION}/../Library") |