head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.42
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.40
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.38
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.36
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.34
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.32
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.30
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.28
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.26
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.24
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.22
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.20
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.18
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.16
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.14
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.12
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.10
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.8
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.6
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.4
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.2
	pkgsrc-2021Q1-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2021.01.13.09.40.40;	author nia;	state Exp;
branches;
next	;
commitid	jAKsxcoPcTvt3yDC;


desc
@@


1.1
log
@ocsync: Fix building with modern compilers and modern libssh.
@
text
@$NetBSD$

Fix detecting the libssh version in newer releases.

--- cmake/Modules/FindLibSSH.cmake.orig	2013-10-18 13:11:09.000000000 +0000
+++ cmake/Modules/FindLibSSH.cmake
@@@@ -58,15 +58,15 @@@@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
     )
 
     if (LibSSH_FIND_VERSION)
-      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
+      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR
         REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
       # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
       if (LIBSSH_VERSION_MAJOR)
         string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
+	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR
           REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
+	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH
           REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
 
@@@@ -75,7 +75,7 @@@@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
 	include(FindPackageVersionCheck)
 	find_package_version_check(LibSSH DEFAULT_MSG)
       else (LIBSSH_VERSION_MAJOR)
-        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
+        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old")
         set(LIBSSH_FOUND FALSE)
       endif (LIBSSH_VERSION_MAJOR)
     endif (LibSSH_FIND_VERSION)
@