CMake: various tidying-up

(cherry picked from commit 294f0c7e1a)
This commit is contained in:
Adriaan de Groot
2021-05-24 15:44:05 +00:00
committed by Carl Schwan
parent 44d3f628d9
commit d81e4c417d
2 changed files with 6 additions and 4 deletions

View File

@@ -7,14 +7,16 @@
# first try to find cmark-config.cmake
# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
find_package(cmark CONFIG)
find_package(cmark CONFIG QUIET)
if(cmark_FOUND AND TARGET cmark::cmark)
# found it!
return()
endif()
include(FindPkgConfig)
pkg_check_modules(PC_CMARK QUIET cmark)
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
pkg_check_modules(PC_CMARK QUIET cmark)
endif()
if(NOT CMARK_INCLUDE_DIR)
find_path(CMARK_INCLUDE_DIR

View File

@@ -33,7 +33,7 @@ add_executable(neochat
../res.qrc
)
if(${Quotient_VERSION_MINOR} GREATER 6)
if(Quotient_VERSION_MINOR GREATER 6)
target_compile_definitions(neochat PRIVATE QUOTIENT_07)
endif()