mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 21:15:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

cmake: Update FindNeon and add support for version checking.

Browse source
This commit is contained in:
Andreas Schneider 2013-07-12 11:57:07 +02:00
parent c1e02db882
commit 9382a047ae
2 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
cmake/Modules/FindNeon.cmake
View file

@ -6,7 +6,7 @@
# NEON_LIBRARIES - Link these to use Neon
# NEON_DEFINITIONS - Compiler switches required for using Neon
#
# Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
# Copyright (c) 2011-2013 Andreas Schneider <asn@cryptomilk.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
@ -14,52 +14,44 @@
#
if (NEON_LIBRARIES AND NEON_INCLUDE_DIRS)
# in cache already
set(NEON_FOUND TRUE)
else (NEON_LIBRARIES AND NEON_INCLUDE_DIRS)
if (UNIX)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(_NEON neon)
endif (PKG_CONFIG_FOUND)
endif (UNIX)
find_path(NEON_INCLUDE_DIR
find_path(NEON_INCLUDE_DIR
NAMES
neon/ne_basic.h
neon/neon_basics.h
PATHS
${_NEON_INCLUDEDIR}
/usr/include
/usr/local/include
/opt/local/include
/sw/include
)
${_NEON_INCLUDEDIR}
)
find_library(NEON_LIBRARY
find_library(NEON_LIBRARY
NAMES
neon
neon
PATHS
${_NEON_LIBDIR}
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
${_NEON_LIBDIR}
)
set(NEON_INCLUDE_DIRS
set(NEON_INCLUDE_DIRS
${NEON_INCLUDE_DIR}
)
)
if (NEON_LIBRARY)
if (NEON_LIBRARY)
set(NEON_LIBRARIES
${NEON_LIBRARIES}
${NEON_LIBRARY}
)
endif (NEON_LIBRARY)
endif (NEON_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Neon DEFAULT_MSG NEON_LIBRARIES NEON_INCLUDE_DIRS)
if (Neon_FIND_VERSION AND _NEON_VERSION)
set(Neon_VERSION _NEON_VERSION)
endif (Neon_FIND_VERSION AND _NEON_VERSION)
# show the NEON_INCLUDE_DIRS and NEON_LIBRARIES variables only in the advanced view
mark_as_advanced(NEON_INCLUDE_DIRS NEON_LIBRARIES)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Neon DEFAULT_MSG NEON_LIBRARIES NEON_INCLUDE_DIRS)
endif (NEON_LIBRARIES AND NEON_INCLUDE_DIRS)
# show the NEON_INCLUDE_DIRS and NEON_LIBRARIES variables only in the advanced view
mark_as_advanced(NEON_INCLUDE_DIRS NEON_LIBRARIES)

2
modules/CMakeLists.txt
View file

@ -1,7 +1,7 @@
project(modules C)
find_package(LibSSH 0.4.0)
find_package(Neon)
find_package(Neon 0.29.0)
set(PLUGIN_VERSION_INSTALL_DIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")