ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-18 10:35:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix travis

Browse Source
This commit is contained in:
yossizap 2019-11-15 20:30:25 +00:00 committed by Florian Märkl
parent 5200845fd0
commit e9994fab28
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -516,6 +516,10 @@ if(CUTTER_ENABLE_PYTHON)
endif() endif()
endforeach() endforeach()
<<<<<<< HEAD
=======
get_target_property(BINDINGS_INCLUDE_DIRS CutterLib INCLUDE_DIRECTORIES)
>>>>>>> Fix travis
if(APPLE AND _qt5Core_install_prefix) if(APPLE AND _qt5Core_install_prefix)
list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include") list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include")
list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtCore") list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtCore")
@ -595,3 +599,7 @@ if(UNIX AND NOT APPLE)
DESTINATION "share/applications" DESTINATION "share/applications"
COMPONENT Devel) COMPONENT Devel)
endif() endif()
if(CUTTER_ENABLE_TESTS)
add_subdirectory(test)
endif()