Skip to content

Commit 4ff1d33

Browse files
committed
Fixed travis display issues and macos cuttertest breakpad linking
1 parent ea86670 commit 4ff1d33

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ script:
133133
- mkdir build
134134
- cd build
135135
- export PKG_CONFIG_PATH="$CUSTOM_BREAKPAD_PREFIX/lib/pkgconfig:$CUSTOM_PYTHON_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
136+
- export QT_QPA_PLATFORM_PATH=$Qt5_ROOT/plugins
137+
- export QT_QPA_PLATFORM=minimal
136138
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
137139
if [[ "$BUILD_SYSTEM" == "qmake" ]]; then
138140
qmake

src/CMakeLists.txt

+7-4
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ set_target_properties(Cutter PROPERTIES
167167
ENABLE_EXPORTS ON
168168
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist")
169169
target_link_libraries(Cutter CutterLib)
170+
if(CUTTER_ENABLE_TESTS)
171+
add_subdirectory(test)
172+
endif()
170173

171174
if (TARGET Graphviz::GVC)
172175
target_link_libraries(CutterLib Graphviz::GVC)
@@ -184,6 +187,10 @@ if(CUTTER_ENABLE_CRASH_REPORTS)
184187
include_directories("${BREAKPAD_FRAMEWORK_DIR}/Breakpad.framework/Headers")
185188
set_target_properties(Cutter PROPERTIES LINK_FLAGS "-Wl,-F${BREAKPAD_FRAMEWORK_DIR}")
186189
target_link_libraries(Cutter "-framework Breakpad")
190+
if(CUTTER_ENABLE_TESTS)
191+
set_target_properties(CutterTest PROPERTIES LINK_FLAGS "-Wl,-F${BREAKPAD_FRAMEWORK_DIR}")
192+
target_link_libraries(CutterTest "-framework Breakpad")
193+
endif()
187194
else()
188195
find_package(Breakpad REQUIRED)
189196
include_directories(${BREAKPAD_INCLUDE_DIRS})
@@ -219,7 +226,3 @@ if(TARGET KF5::SyntaxHighlighting)
219226
target_link_libraries(CutterLib KF5::SyntaxHighlighting)
220227
target_compile_definitions(CutterLib PRIVATE CUTTER_ENABLE_KSYNTAXHIGHLIGHTING)
221228
endif()
222-
223-
if(CUTTER_ENABLE_TESTS)
224-
add_subdirectory(test)
225-
endif()

0 commit comments

Comments
 (0)