summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorTeus Benschop <teusjannette@gmail.com>2018-10-02 14:12:36 +0200
committerTeus Benschop <teusjannette@gmail.com>2018-10-02 14:12:36 +0200
commitfe3bed3869a1278cc274d67c1c34605d9a498140 (patch)
treec581beefe76d6d57358e4756923a3de506c7c5a5 /cmake
parent6ca84db1f51ce1a5eea260ddf1be7dd99437ce7e (diff)
New upstream version 2.11.2
Diffstat (limited to 'cmake')
-rw-r--r--cmake/BTBinaryPackageMacOS.cmake6
-rw-r--r--cmake/BTTests.cmake8
-rw-r--r--cmake/BTTranslationMacros.cmake2
-rw-r--r--cmake/BTUITranslation.cmake1
-rw-r--r--cmake/qtbug-35164-patcher.cmake37
5 files changed, 2 insertions, 52 deletions
diff --git a/cmake/BTBinaryPackageMacOS.cmake b/cmake/BTBinaryPackageMacOS.cmake
index 97a97e6..3eca7ae 100644
--- a/cmake/BTBinaryPackageMacOS.cmake
+++ b/cmake/BTBinaryPackageMacOS.cmake
@@ -1,10 +1,4 @@
IF(APPLE)
- # Install the Sword library
- INSTALL(
- FILES "${Sword_LIBRARY_DIRS}/lib${Sword_LIBRARIES}-${Sword_VERSION}.dylib"
- DESTINATION "${BT_DESTINATION}/"
- )
-
IF (CMAKE_BUILD_TYPE STREQUAL "Release")
SET(QT_MACDEPLOYQT_EXECUTABLE "${_qt5Core_install_prefix}/bin/macdeployqt")
INSTALL(CODE "
diff --git a/cmake/BTTests.cmake b/cmake/BTTests.cmake
index 5b44962..0184097 100644
--- a/cmake/BTTests.cmake
+++ b/cmake/BTTests.cmake
@@ -1,11 +1,6 @@
ENABLE_TESTING(true)
-QT5_ADD_RESOURCES(test_RESOURCE_SOURCES
- ${bibletime_SOURCE_DIR}/src/mobile/btm.qrc
- ${bibletime_SOURCE_DIR}/i18n/messages/test_translate.qrc
-)
-
SET(test_OTHER_SOURCES
${bibletime_SOURCE_DIR}/src/frontend/messagedialog.cpp
)
@@ -20,10 +15,9 @@ FUNCTION(test_a_class testDir testClass )
${testDir}/test_${testClass}.cpp
${test_OTHER_SOURCES}
${test_${testClass}_MOC_SRC}
- ${test_RESOURCE_SOURCES}
)
SET_TARGET_PROPERTIES("test_${testClass}" PROPERTIES COMPILE_FLAGS ${Sword_CFLAGS_OTHER} -std=c++11 )
- QT5_USE_MODULES(test_${testClass} Widgets Xml Network Test)
+ TARGET_LINK_LIBRARIES(test_${testClass} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::Test)
TARGET_LINK_LIBRARIES(test_${testClass}
bibletime_common
${Sword_LDFLAGS}
diff --git a/cmake/BTTranslationMacros.cmake b/cmake/BTTranslationMacros.cmake
index 0859a96..5b9d8be 100644
--- a/cmake/BTTranslationMacros.cmake
+++ b/cmake/BTTranslationMacros.cmake
@@ -3,7 +3,7 @@ function(BT_GET_TS_LANGS TS_LANGS)
SET(TS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages")
FILE(GLOB TS_FILES "${TS_DIR}/bibletime_ui_*.ts")
FOREACH(TSFILE_FULLPATH ${TS_FILES})
- STRING(REGEX REPLACE "${TS_DIR}/bibletime_ui_(..(_..)?).ts" "\\1"
+ STRING(REGEX REPLACE "${TS_DIR}/bibletime_ui_(...?(_..)?).ts" "\\1"
TS_LANG "${TSFILE_FULLPATH}")
SET(_TS_LANGS ${_TS_LANGS} ${TS_LANG})
ENDFOREACH()
diff --git a/cmake/BTUITranslation.cmake b/cmake/BTUITranslation.cmake
index 2991c43..7ef62fc 100644
--- a/cmake/BTUITranslation.cmake
+++ b/cmake/BTUITranslation.cmake
@@ -15,4 +15,3 @@ SET(bibletime_UI_translations "${QM_FILES}")
# Invoke this with "make messages"
BT_UPDATE_TS_FILES(${TS_DIR} ${bibletime_TRANSLATION_FILE_PREFIX})
-INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/qtbug-35164-patcher.cmake")
diff --git a/cmake/qtbug-35164-patcher.cmake b/cmake/qtbug-35164-patcher.cmake
deleted file mode 100644
index 2dbb2c3..0000000
--- a/cmake/qtbug-35164-patcher.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Build the qtbug-35164-patcher tool
-MESSAGE(STATUS "qtbug-35164-patcher")
-PROJECT(qtbug-35164-patcher)
-FIND_PACKAGE(Qt5Core REQUIRED)
-ADD_EXECUTABLE(qtbug-35164-patcher
- ${bibletime_SOURCE_DIR}/i18n/qtbug-35164-patcher.cpp
-)
-TARGET_LINK_LIBRARIES(qtbug-35164-patcher Qt5::Core)
-
-
-# Run qtbug-35164-patcher <file>.ts <file>.ts2, then rename <file>.ts2 to <file>.ts
-FUNCTION(qtbug_35164_patcher_func)
- MESSAGE(STATUS "Bug patcher")
- SET(TS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages")
- BT_GET_TS_LANGS(TS_LANGS)
- FOREACH(TS_LANG ${TS_LANGS})
- ADD_CUSTOM_TARGET("qtbug_35164_patcher_${TS_LANG}"
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/qtbug-35164-patcher${CMAKE_EXECUTABLE_SUFFIX}
- ${TS_DIR}/bibletime_ui_${TS_LANG}.ts
- ${TS_DIR}/bibletime_ui_${TS_LANG}.ts2
-
- # Comment out the next 3 lines to be able to see both the unpatched and patched files.
- COMMAND ${CMAKE_COMMAND} -E rename
- ${TS_DIR}/bibletime_ui_${TS_LANG}.ts2
- ${TS_DIR}/bibletime_ui_${TS_LANG}.ts
-
- COMMENT "ran qtbug_35164_patcher on bibletime_ui_${TS_LANG}.ts"
- )
- # Ensure tool is built first and that the ts file is created first
- ADD_DEPENDENCIES("qtbug_35164_patcher_${TS_LANG}" "messages_${TS_LANG}" "qtbug-35164-patcher" )
- ADD_DEPENDENCIES("messages" "qtbug_35164_patcher_${TS_LANG}")
- ENDFOREACH()
-endfunction()
-
-qtbug_35164_patcher_func()
-