Commit 36f464d9 authored by Thomas Friedrichsmeier's avatar Thomas Friedrichsmeier
Browse files

Compile in kxmlgui .rc files

This should fix some cross-platform worries.
(needs KF5 >= 5.4, but that should be tolerable)
parent 7401ea55
......@@ -22,7 +22,7 @@ INCLUDE(ECMMarkNonGuiExecutable)
INCLUDE(FeatureSummary)
FIND_PACKAGE(Qt5 5.2 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network WebKitWidgets Script PrintSupport)
FIND_PACKAGE(KF5 5.2 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons WebKit Parts Config Notifications WindowSystem OPTIONAL_COMPONENTS Crash)
FIND_PACKAGE(KF5 5.4 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons WebKit Parts Config Notifications WindowSystem OPTIONAL_COMPONENTS Crash)
FIND_PACKAGE(Gettext REQUIRED)
# FindIntl in cmake is broken for MSVC on Windows, (and only included from 3.2.3 upwards).
......
--- Version 0.7.1 - UNRELEASED
- Compile in ui definitions, instead of providing them as separate files
- Fix printing of strings with R 3.5.0 on Windows in the console
- Offer R_LIBS_USER, instead of ~/.rkward/library as standard library installation location
- Support R version placeholder (%v) in custom library locations.
......
......@@ -5,9 +5,9 @@ ENDIF(NOT ${PROJECT_NAME} STREQUAL "rkward")
INCLUDE(SetVersionNumber.cmake)
IF(APPLE)
SET(CPACK_BUNDLE_ICON rkward.icns)
SET(CPACK_BUNDLE_NAME RKWard)
SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
SET(CPACK_BUNDLE_ICON rkward.icns)
SET(CPACK_BUNDLE_NAME RKWard)
SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
ENDIF()
# once tested and working this could become the default on Mac:
......@@ -36,6 +36,7 @@ SET(RKWard_Sources
robjectviewer.cpp
rkconsole.cpp
)
QT5_ADD_RESOURCES(RKWard_Sources resources.qrc)
# somehow the detected R paths from FindR.cmake do not get passed down automatically
GET_DIRECTORY_PROPERTY(R_EXECUTABLE DIRECTORY rbackend DEFINITION R_EXECUTABLE)
......@@ -84,7 +85,6 @@ ENDIF(KF5Crash_FOUND)
INSTALL(DIRECTORY plugins/ pages DESTINATION ${DATA_INSTALL_DIR}/rkward
PATTERN .svn EXCLUDE)
INSTALL(FILES rkwardui.rc rkconsolepart.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward)
INSTALL(FILES resource.ver DESTINATION ${DATA_INSTALL_DIR}/rkward)
IF(APPLE)
......
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
########### next target ###############
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
SET(dataeditor_STAT_SRCS
twintable.cpp
......@@ -14,7 +11,3 @@ SET(dataeditor_STAT_SRCS
ADD_LIBRARY(dataeditor STATIC ${dataeditor_STAT_SRCS})
TARGET_LINK_LIBRARIES(dataeditor Qt5::Widgets KF5::WidgetsAddons KF5::Parts)
########### install files ###############
INSTALL(FILES rkeditordataframepart.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward )
......@@ -31,9 +31,3 @@ SET(misc_STAT_SRCS
ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
TARGET_LINK_LIBRARIES(misc Qt5::Widgets KF5::WidgetsAddons KF5::KIOWidgets Qt5::Xml KF5::ConfigCore KF5::Parts KF5::WindowSystem KF5::TextEditor)
########### install files ###############
INSTALL(FILES
rkdummypart.rc
DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward)
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/kxmlgui5/rkward">
<file>rkwardui.rc</file>
<file>rkconsolepart.rc</file>
<file alias="rkcommandeditorwindowpart.rc">windows/rkcommandeditorwindowpart.rc</file>
<file alias="rkoutputwindow.rc">windows/rkoutputwindow.rc</file>
<file alias="rkhelpwindow.rc">windows/rkhelpwindow.rc</file>
<file alias="detachedwindowcontainer.rc">windows/detachedwindowcontainer.rc</file>
<file alias="rkcatchedx11windowpart.rc">windows/rkcatchedx11windowpart.rc</file>
<file alias="rkcommandlogpart.rc">windows/rkcommandlogpart.rc</file>
<file alias="rktoplevelwindowgui.rc">windows/rktoplevelwindowgui.rc</file>
<file alias="rkstandardactions.rc">windows/rkstandardactions.rc</file>
<file alias="rkeditordataframepart.rc">dataeditor/rkeditordataframepart.rc</file>
<file alias="rkdummypart.rc">misc/rkdummypart.rc</file>
</qresource>
</RCC>
......@@ -25,16 +25,3 @@ SET(windows_STAT_SRCS
ADD_LIBRARY(windows STATIC ${windows_STAT_SRCS})
TARGET_LINK_LIBRARIES(windows Qt5::Widgets Qt5::Xml Qt5::PrintSupport Qt5::WebKitWidgets KF5::TextEditor KF5::WebKit KF5::Notifications KF5::WindowSystem KF5::KIOFileWidgets)
########### install files ###############
INSTALL(FILES
rkcommandeditorwindowpart.rc
rkoutputwindow.rc
rkhelpwindow.rc
detachedwindowcontainer.rc
rkcatchedx11windowpart.rc
rkcommandlogpart.rc
rktoplevelwindowgui.rc
rkstandardactions.rc
DESTINATION ${KXMLGUI_INSTALL_DIR}/rkward)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment