diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/BTBinaryPackageMacOS.cmake | 26 | ||||
| -rw-r--r-- | cmake/BTUITranslation.cmake | 25 | ||||
| -rw-r--r-- | cmake/FindCLucene.cmake | 3 | ||||
| -rw-r--r-- | cmake/platforms/linux/bibletime.desktop.cmake | 2 |
4 files changed, 21 insertions, 35 deletions
diff --git a/cmake/BTBinaryPackageMacOS.cmake b/cmake/BTBinaryPackageMacOS.cmake index ed22382..abe359a 100644 --- a/cmake/BTBinaryPackageMacOS.cmake +++ b/cmake/BTBinaryPackageMacOS.cmake @@ -20,32 +20,11 @@ IF(APPLE) INSTALL(CODE " FILE(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") -# FILE(GLOB_RECURSE QTPLUGINS -# \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/*.bundle\") - INCLUDE(BundleUtilities) - - - function(gp_item_default_embedded_path_override item default_embedded_path_var) - set(path \"\@executable_path/../MacOS\") - set(overridden 0) - - if(item MATCHES \"plugins/iconengines/.*\\\\.dylib$\") - set(path \"\@executable_path/plugins/iconengines\") - set(overridden 1) - endif(item MATCHES \"plugins/iconengines/.*\\\\.dylib$\") - if(item MATCHES \"plugins/imageformats/.*\\\\.dylib$\") - set(path \"\@executable_path/plugins/imageformats\") - set(overridden 1) - endif(item MATCHES \"plugins/imageformats/.*\\\\.dylib$\") - - if (overridden) - set(\${default_embedded_path_var} \"\${path}\" PARENT_SCOPE) - endif (overridden) - endfunction(gp_item_default_embedded_path_override) + INCLUDE(BundleUtilities) FIXUP_BUNDLE( - \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/BibleTime\" + \"\${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/BibleTime\" \"\${QTPLUGINS}\" \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/imageformats;\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/iconengines\" ) @@ -64,4 +43,3 @@ IF(APPLE) INCLUDE(CPack) ENDIF(APPLE) - diff --git a/cmake/BTUITranslation.cmake b/cmake/BTUITranslation.cmake index c55f68c..cf6c6b7 100644 --- a/cmake/BTUITranslation.cmake +++ b/cmake/BTUITranslation.cmake @@ -1,16 +1,21 @@ SET(bibletime_UI_translations) -FIND_PROGRAM(QT_LUPDATE_EXECUTABLE - NAMES lupdate-qt4 lupdate - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH -) +IF (Qt5Core_FOUND) + SET(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE}) + SET(QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE}) +ELSE (Qt5Core_FOUND) + FIND_PROGRAM(QT_LUPDATE_EXECUTABLE + NAMES lupdate-qt4 lupdate + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) -FIND_PROGRAM(QT_LRELEASE_EXECUTABLE - NAMES lrelease-qt4 lrelease - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH -) + FIND_PROGRAM(QT_LRELEASE_EXECUTABLE + NAMES lrelease-qt4 lrelease + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) +ENDIF (Qt5Core_FOUND) FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS}) ADD_CUSTOM_COMMAND(OUTPUT "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm" diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake index 9c9df7d..173f69d 100644 --- a/cmake/FindCLucene.cmake +++ b/cmake/FindCLucene.cmake @@ -42,6 +42,8 @@ ENDIF(MSVC) SET(TRIAL_LIBRARY_PATHS $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} + /usr/lib/i386-linux-gnu + /usr/lib/x86_64-linux-gnu /usr/local/lib${LIB_SUFFIX} /opt/local/lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX} @@ -54,6 +56,7 @@ SET(TRIAL_INCLUDE_PATHS $ENV{CLUCENE_HOME}/include ${CMAKE_INSTALL_PREFIX}/include /usr/local/include + /opt/local/include /usr/include /sw/include /usr/pkg/include diff --git a/cmake/platforms/linux/bibletime.desktop.cmake b/cmake/platforms/linux/bibletime.desktop.cmake index 15dd6d1..e97d80b 100644 --- a/cmake/platforms/linux/bibletime.desktop.cmake +++ b/cmake/platforms/linux/bibletime.desktop.cmake @@ -22,5 +22,5 @@ Name[it]=BibleTime ${BT_VERSION} GenericName=Bible Study Tool Terminal=false Type=Application -Categories=X-Bible;X-Religion;Literature;Education;Dictionary;Qt +Categories=X-Bible;X-Religion;Literature;Education;Dictionary;Qt; DocPath=bibletime/handbook/index.html |