From 23eeacdecf205c5192ac2386b4074c45a69fb918 Mon Sep 17 00:00:00 2001 From: Eric Van Albert Date: Tue, 30 Oct 2018 23:04:24 -0400 Subject: [PATCH 1/3] make make install do a sanity check --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed33b5fd..7e010a87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,16 @@ set_target_properties(radiance PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOUR target_link_libraries(libradiance ${radiance_LIBRARIES}) target_link_libraries(radiance libradiance ${radiance_LIBRARIES}) +function(check_resources) +endfunction() + +install(CODE " + if(NOT \"${RADIANCE_SYSTEM_RESOURCES}\" STREQUAL \"${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\") + MESSAGE(\"For an install to work, RADIANCE_SYSTEM_RESOURCES must be set to '\\\${CMAKE_INSTALL_PREFIX}share/${PROJECT_NAME}/'\") + MESSAGE(FATAL_ERROR \"Please recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\") + endif() +") + INSTALL(TARGETS radiance DESTINATION bin ) From 0b83690b92a97ed68f0ae855668788afe5fef4e0 Mon Sep 17 00:00:00 2001 From: Eric Van Albert Date: Tue, 30 Oct 2018 23:12:37 -0400 Subject: [PATCH 2/3] Prevent scrolling past the end --- resources/qml/ConsoleWidget.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/ConsoleWidget.qml b/resources/qml/ConsoleWidget.qml index 7204aded..19879ffd 100644 --- a/resources/qml/ConsoleWidget.qml +++ b/resources/qml/ConsoleWidget.qml @@ -121,7 +121,7 @@ Item { if (count == 0) popIn(); } onContentHeightChanged: { - contentY = contentHeight - height; + contentY = Math.max(contentHeight - height, 0); } ScrollIndicator.vertical: ScrollIndicator {} From c3b2c779b944eb42e8627730d8d0a87c84b8fc06 Mon Sep 17 00:00:00 2001 From: Eric Van Albert Date: Tue, 30 Oct 2018 23:15:06 -0400 Subject: [PATCH 3/3] remove cruft --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e010a87..41c33129 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,9 +128,6 @@ set_target_properties(radiance PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOUR target_link_libraries(libradiance ${radiance_LIBRARIES}) target_link_libraries(radiance libradiance ${radiance_LIBRARIES}) -function(check_resources) -endfunction() - install(CODE " if(NOT \"${RADIANCE_SYSTEM_RESOURCES}\" STREQUAL \"${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\") MESSAGE(\"For an install to work, RADIANCE_SYSTEM_RESOURCES must be set to '\\\${CMAKE_INSTALL_PREFIX}share/${PROJECT_NAME}/'\")