-
Notifications
You must be signed in to change notification settings - Fork 191
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1171 from CESNET/devel
Devel merge
- Loading branch information
Showing
59 changed files
with
1,798 additions
and
3,698 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,11 +4,12 @@ | |
| # LIBNETCONF2_FOUND - system has LibNETCONF2 | ||
| # LIBNETCONF2_INCLUDE_DIRS - the LibNETCONF2 include directory | ||
| # LIBNETCONF2_LIBRARIES - Link these to use LibNETCONF2 | ||
| # LIBNETCONF2_VERSION - SO version of the found libNETCONF2 library | ||
| # LIBNETCONF2_ENABLED_SSH - LibNETCONF2 was compiled with SSH support | ||
| # LIBNETCONF2_ENABLED_TLS - LibNETCONF2 was compiled with TLS support | ||
| # | ||
| # Author Michal Vasko <[email protected]> | ||
| # Copyright (c) 2020 CESNET, z.s.p.o. | ||
| # Copyright (c) 2021 CESNET, z.s.p.o. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions | ||
|
|
@@ -34,7 +35,6 @@ | |
| # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| # | ||
| include(FindPackageHandleStandardArgs) | ||
| include(CheckSymbolExists) | ||
|
|
||
| if(LIBNETCONF2_LIBRARIES AND LIBNETCONF2_INCLUDE_DIRS) | ||
| # in cache already | ||
|
|
@@ -68,13 +68,28 @@ else() | |
| ${CMAKE_INSTALL_PREFIX}/lib | ||
| ) | ||
|
|
||
| if(LIBNETCONF2_INCLUDE_DIR) | ||
| find_path(NC_VERSION_PATH "nc_version.h" HINTS ${LIBNETCONF2_INCLUDE_DIR}) | ||
| if(NOT NC_VERSION_PATH) | ||
| message(STATUS "libnetconf2 version header not found, assuming libnetconf2 is too old and cannot be used!") | ||
| set(LIBNETCONF2_INCLUDE_DIR "LIBNETCONF2_INCLUDE_DIR-NOTFOUND") | ||
| set(LIBNETCONF2_LIBRARY "LIBNETCONF2_LIBRARY-NOTFOUND") | ||
| else() | ||
| file(READ "${NC_VERSION_PATH}/nc_version.h" NC_VERSION_FILE) | ||
| string(REGEX MATCH "#define NC_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\"" NC_VERSION_MACRO "${NC_VERSION_FILE}") | ||
| string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" LIBNETCONF2_VERSION "${NC_VERSION_MACRO}") | ||
| endif() | ||
| endif() | ||
|
|
||
| set(LIBNETCONF2_INCLUDE_DIRS ${LIBNETCONF2_INCLUDE_DIR}) | ||
| set(LIBNETCONF2_LIBRARIES ${LIBNETCONF2_LIBRARY}) | ||
| mark_as_advanced(LIBNETCONF2_INCLUDE_DIRS LIBNETCONF2_LIBRARIES) | ||
|
|
||
| # handle the QUIETLY and REQUIRED arguments and set SYSREPO_FOUND to TRUE | ||
| # if all listed variables are TRUE | ||
| find_package_handle_standard_args(LibNETCONF2 DEFAULT_MSG LIBNETCONF2_LIBRARY LIBNETCONF2_INCLUDE_DIR) | ||
| find_package_handle_standard_args(LibNETCONF2 FOUND_VAR LIBNETCONF2_FOUND | ||
| REQUIRED_VARS LIBNETCONF2_LIBRARY LIBNETCONF2_INCLUDE_DIR | ||
| VERSION_VAR LIBNETCONF2_VERSION) | ||
|
|
||
| # check the configured options and make them available through cmake | ||
| list(INSERT CMAKE_REQUIRED_INCLUDES 0 "${LIBNETCONF2_INCLUDE_DIR}") | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # - Try to find LibSystemd, it is expected find_package(PkgConfig) was called before | ||
| # | ||
| # Once done this will define | ||
| # | ||
| # LIBSYSTEMD_FOUND - system has LibSystemd | ||
| # LIBSYSTEMD_INCLUDE_DIRS - the LibSystemd include directory | ||
| # LIBSYSTEMD_LIBRARIES - link these to use LibSystemd | ||
| # SYSTEMD_UNIT_DIR - directory with systemd system unit files | ||
| # | ||
| # Author Michal Vasko <[email protected]> | ||
| # Copyright (c) 2022 CESNET, z.s.p.o. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions | ||
| # are met: | ||
| # | ||
| # 1. Redistributions of source code must retain the copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # 2. Redistributions in binary form must reproduce the copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # 3. The name of the author may not be used to endorse or promote products | ||
| # derived from this software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
| # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
| # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
| # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| # | ||
| include(FindPackageHandleStandardArgs) | ||
|
|
||
| if(LIBSYSTEMD_LIBRARIES AND LIBSYSTEMD_INCLUDE_DIRS AND SYSTEMD_UNIT_DIR) | ||
| # in cache already | ||
| set(LIBSYSTEMD_FOUND TRUE) | ||
| else() | ||
| find_path(LIBSYSTEMD_INCLUDE_DIR | ||
| NAMES | ||
| systemd/sd-daemon.h | ||
| PATHS | ||
| /usr/include | ||
| /usr/local/include | ||
| /opt/local/include | ||
| /sw/include | ||
| ${CMAKE_INCLUDE_PATH} | ||
| ${CMAKE_INSTALL_PREFIX}/include | ||
| ) | ||
|
|
||
| find_library(LIBSYSTEMD_LIBRARY | ||
| NAMES | ||
| systemd | ||
| libsystemd | ||
| PATHS | ||
| /usr/lib | ||
| /usr/lib64 | ||
| /usr/local/lib | ||
| /usr/local/lib64 | ||
| /opt/local/lib | ||
| /sw/lib | ||
| ${CMAKE_LIBRARY_PATH} | ||
| ${CMAKE_INSTALL_PREFIX}/lib | ||
| ) | ||
|
|
||
| if(NOT SYSTEMD_UNIT_DIR) | ||
| execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --define-variable=rootprefix=${CMAKE_INSTALL_PREFIX} --variable=systemdsystemunitdir systemd | ||
| OUTPUT_VARIABLE SYSTEMD_UNIT_DIR) | ||
| string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_UNIT_DIR "${SYSTEMD_UNIT_DIR}") | ||
| endif() | ||
|
|
||
| set(LIBSYSTEMD_INCLUDE_DIRS ${LIBSYSTEMD_INCLUDE_DIR}) | ||
| set(LIBSYSTEMD_LIBRARIES ${LIBSYSTEMD_LIBRARY}) | ||
| mark_as_advanced(LIBSYSTEMD_INCLUDE_DIRS LIBSYSTEMD_LIBRARIES) | ||
|
|
||
| # handle the QUIETLY and REQUIRED arguments and set LIBSYSTEMD_FOUND to TRUE | ||
| # if all listed variables are TRUE | ||
| find_package_handle_standard_args(LibSystemd FOUND_VAR LIBSYSTEMD_FOUND | ||
| REQUIRED_VARS LIBSYSTEMD_LIBRARY LIBSYSTEMD_INCLUDE_DIR SYSTEMD_UNIT_DIR) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.