ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 05:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve compatibility with cmake 3.10. (#1882)

Browse Source
This commit is contained in:
karliss 2019-12-02 09:18:25 +02:00 committed by Florian Märkl
parent c1093f3971
commit af5d1dd3aa
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/source/building.rst
View File

@ -243,6 +243,8 @@ so it contains ``$CUSTOM_BREAKPAD_PREFIX/lib/pkgconfig``. For this simply run
Troubleshooting Troubleshooting
--------------- ---------------
* Cmake can't find Qt
Cmake: qt development package not found Cmake: qt development package not found
Depending on how Qt installed (Distribution packages or using the Qt Depending on how Qt installed (Distribution packages or using the Qt
@ -257,3 +259,15 @@ containing bin/, lib/, include/, etc.) and specify it to CMake using
rm CMakeCache.txt # the cache may be polluted with unwanted libraries found before rm CMakeCache.txt # the cache may be polluted with unwanted libraries found before
cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.9.1/gcc_64 .. cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.9.1/gcc_64 ..
* R2 libr_***.so cannot be found when running Cutter
./Cutter: error while loading shared libraries: libr_lang.so: cannot open shared object file: No such file or directory
The exact r2 .so file that cannot be found may vary. On some systems linker by default uses RUNPATH instead of RPATH which is incompatible with the way r2 is currently compiled. It results in some of the r2 libraries not being found when running cutter. You can verify if this is the problem by running `ldd ./Cutter`. If all the r2 libraries are missing you have a different problem.
Workaround is to either add `--disable-new-dtags` linker flag when compiling Cutter or add r2 installation path to LD_LIBRARY_PATH environment variable.
::
cmake -DCMAKE_EXE_LINKER_FLAGS="-Wl,--disable-new-dtags" ..

6
src/cmake/FindGraphviz.cmake
View File

@ -1,8 +1,10 @@
set (_module Graphviz) set (_module Graphviz)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
if (NOT (CMAKE_VERSION VERSION_LESS "3.6.0")) if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
pkg_check_modules(GVC IMPORTED_TARGET GLOBAL libgvc) pkg_check_modules(GVC IMPORTED_TARGET GLOBAL libgvc)
elseif (NOT (CMAKE_VERSION VERSION_LESS "3.11.0"))
pkg_check_modules(GVC IMPORTED_TARGET libgvc)
else() else()
pkg_check_modules(GVC libgvc) pkg_check_modules(GVC libgvc)
endif() endif()
@ -13,7 +15,7 @@ find_package_handle_standard_args(${_module}
REQUIRED_VARS GVC_INCLUDE_DIRS) REQUIRED_VARS GVC_INCLUDE_DIRS)
if (${GVC_FOUND}) if (${GVC_FOUND})
if (CMAKE_VERSION VERSION_LESS "3.6.0") if (CMAKE_VERSION VERSION_LESS "3.11.0")
add_library(${_module}::GVC INTERFACE IMPORTED) add_library(${_module}::GVC INTERFACE IMPORTED)
set_target_properties(${_module}::GVC PROPERTIES set_target_properties(${_module}::GVC PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${GVC_INCLUDE_DIRS}") INTERFACE_INCLUDE_DIRECTORIES "${GVC_INCLUDE_DIRS}")

9
src/cmake/FindRadare2.cmake
View File

@ -84,8 +84,17 @@ else()
mark_as_advanced(Radare2_CMAKE_PREFIX_PATH_TEMP) mark_as_advanced(Radare2_CMAKE_PREFIX_PATH_TEMP)
if(TARGET PkgConfig::Radare2) if(TARGET PkgConfig::Radare2)
if (CMAKE_VERSION VERSION_LESS "3.11.0")
add_library(Radare2::libr INTERFACE IMPORTED)
set_target_properties(Radare2::libr PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Radare2_INCLUDE_DIRS}")
set_target_properties(Radare2::libr PROPERTIES
INTERFACE_LINK_LIBRARIES "${Radare2_LIBRARIES}")
link_directories("${Radare2_LIBDIR}") # target specific link directory or flags require even newer cmake
else()
set_target_properties(PkgConfig::Radare2 PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(PkgConfig::Radare2 PROPERTIES IMPORTED_GLOBAL ON)
add_library(Radare2::libr ALIAS PkgConfig::Radare2) add_library(Radare2::libr ALIAS PkgConfig::Radare2)
endif()
set(Radare2_TARGET Radare2::libr) set(Radare2_TARGET Radare2::libr)
else() else()
set(Radare2_TARGET Radare2_TARGET-NOTFOUND) set(Radare2_TARGET Radare2_TARGET-NOTFOUND)