Yet another Findyaml update

Author: jbigot

README.md

@@ -39,7 +39,7 @@ The paraconf distribution depends on:
   * cmake, version >= 3.5
   * a C-99 compiler (gcc-5.4 is tested)
   * a POSIX compatible OS (linux with GNU libc-2.27 is tested)
-  * [libyaml](https://pyyaml.org/wiki/LibYAML) (distributed with Paraconf
+  * [libyaml](https://pyyaml.org/wiki/LibYAML) (included in Paraconf
     distribution)
 
 Paraconf Fortran support depends on:

cmake/SuperBuild.cmake

@@ -24,6 +24,11 @@
 
 cmake_minimum_required(VERSION 3.5)
 
+cmake_policy(PUSH)
+if(POLICY CMP0114)
+	cmake_policy(SET CMP0114 OLD)
+endif()
+
 include(GNUInstallDirs)
 include(ExternalProject)
 
@@ -358,3 +363,5 @@ endif()
 ## Installation
 
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/staging/" DESTINATION "." USE_SOURCE_PERMISSIONS)
+
+cmake_policy(POP)

paraconf/cmake/Findyaml.cmake

@@ -36,48 +36,68 @@ cmake_minimum_required(VERSION 3.5)
 function(_yaml_Find_Config)
 	find_package(yaml ${yaml_FIND_VERSION} QUIET CONFIG)
 	if("${yaml_FOUND}")
+		get_target_property(yaml_LIBRARIES yaml LOCATION)
+		set(yaml_LIBRARIES "${yaml_LIBRARIES}" PARENT_SCOPE)
+		get_target_property(yaml_INCLUDE_DIRS yaml INTERFACE_INCLUDE_DIRECTORIES)
+		set(yaml_INCLUDE_DIRS "${yaml_INCLUDE_DIRS}" PARENT_SCOPE)
 		mark_as_advanced(yaml_DIR)
 	else()
 		unset(yaml_DIR CACHE)
 	endif()
 endfunction(_yaml_Find_Config)
 
+function(_yaml_Find_Cache)
+	if(DEFINED CACHE{yaml_LIBRARIES} AND EXISTS "${yaml_LIBRARIES}")
+		add_library(yaml SHARED IMPORTED GLOBAL)
+		set_target_properties(yaml PROPERTIES
+				IMPORTED_LOCATION ${yaml_LIBRARIES}
+				INTERFACE_INCLUDE_DIRECTORIES "${yaml_INCLUDE_DIRS}")
+	endif()
+endfunction(_yaml_Find_Cache)
+
 function(_yaml_Find_Pkgconfig)
-        find_package(PkgConfig QUIET)
-        if( NOT "${PKG_CONFIG_FOUND}" )
-                if (NOT "${yaml_FIND_QUIETLY}")
-                        message("PkgConfig not found, unable to look for yaml")
-                endif()
-                return()
-        endif()
-        
-	if( NOT "x${yaml_FIND_VERSION}" STREQUAL "x")
-		pkg_search_module(yamlpkg QUIET yaml>=${yaml_FIND_VERSION} yaml-0.1>=${yaml_FIND_VERSION})
-		if ( NOT "${yamlpkg_FOUND}" )
-			pkg_search_module(yamlpkg QUIET yaml yaml-0.1)
+	find_package(PkgConfig QUIET)
+	if(NOT "${PKG_CONFIG_FOUND}")
+		if(NOT "${yaml_FIND_QUIETLY}")
+			message("PkgConfig not found, unable to look for yaml")
 		endif()
-	else()
-                pkg_search_module(yamlpkg QUIET yaml yaml-0.1)
-        endif()
-        
-        if ( "${yamlpkg_FOUND}" AND NOT "0${yaml_FIND_VERSION}" VERSION_GREATER "0${yamlpkg_VERSION}" )
-                find_library (yaml_LIBRARIES NAMES ${yamlpkg_LIBRARIES}
-                        HINTS ${yamlpkg_LIBRARY_DIRS}
-                        PATH_SUFFIXES lib
+		return()
+	endif()
+
+	set(PKGCFG_NAMES yaml yaml-0.1)
+	if(NOT "x${yaml_FIND_VERSION}" STREQUAL "x")
+		set(PKGCFG_NAMES yaml>=${yaml_FIND_VERSION} yaml-0.1>=${yaml_FIND_VERSION} ${PKGCFG_NAMES})
+	endif()
+	foreach(PKGCFG_NAME IN LISTS PKGCFG_NAMES)
+		pkg_search_module(yamlpkg QUIET ${PKGCFG_NAME})
+		if("${yamlpkg_FOUND}")
+			pkg_get_variable(yamlpkg_INCLUDEDIR ${PKGCFG_NAME} includedir)
+			break()
+		endif()
+		unset(yamlpkg_FOUND CACHE)
+		unset(yamlpkg_FOUND)
+	endforeach()
+
+	if("${yamlpkg_FOUND}" AND NOT "0${yaml_FIND_VERSION}" VERSION_GREATER "0${yamlpkg_VERSION}")
+		set(yamlpkg_INCLUDE_DIRS ${yamlpkg_INCLUDE_DIRS} ${yamlpkg_INCLUDEDIR})
+		find_library(yaml_LIBRARIES NAMES ${yamlpkg_LIBRARIES}
+				HINTS ${yamlpkg_LIBRARY_DIRS}
+				PATH_SUFFIXES lib
 		)
-		if ( EXISTS "${yaml_LIBRARIES}" )
+		if(EXISTS "${yaml_LIBRARIES}")
+			set(yaml_LIBRARIES "${yaml_LIBRARIES}" CACHE STRING "yaml libraries path" FORCE)
 			add_library(yaml SHARED IMPORTED GLOBAL)
 			set_target_properties(yaml PROPERTIES
 					IMPORTED_LOCATION ${yaml_LIBRARIES})
-			if ( NOT "${yamlpkg_INCLUDE_DIRS}" STREQUAL "" )
-				set(yaml_INCLUDE_DIRS "${yamlpkg_INCLUDE_DIRS}" CACHE STRING "" FORCE)
+			if(NOT "${yamlpkg_INCLUDE_DIRS}" STREQUAL "")
+				set(yaml_INCLUDE_DIRS "${yamlpkg_INCLUDE_DIRS}" CACHE STRING "yaml include path" FORCE)
 				set_target_properties(yaml PROPERTIES
-						INTERFACE_INCLUDE_DIRECTORIES ${yamlpkg_INCLUDE_DIRS})
+						INTERFACE_INCLUDE_DIRECTORIES "${yamlpkg_INCLUDE_DIRS}")
 			endif()
 			mark_as_advanced(yaml_INCLUDE_DIRS yaml_LIBRARIES)
 			if("${yamlpkg_VERSION}" VERSION_GREATER 0)
-				set(yaml_VERSION "${yamlpkg_VERSION}" PARENT_SCOPE)
-				set(yaml_VERSION "${yamlpkg_VERSION}" CACHE STRING "" FORCE)
+				set(yaml_VERSION "${yamlpkg_VERSION}" CACHE STRING "yaml version found" FORCE)
+				mark_as_advanced(yaml_VERSION)
 			else()
 				unset(yaml_VERSION PARENT_SCOPE)
 			endif()
@@ -87,22 +107,23 @@ endfunction(_yaml_Find_Pkgconfig)
 
 unset(yaml_FOUND)
 unset(yaml_LIBRARIES)
+unset(yaml_INCLUDE_DIRS)
 unset(yaml_VERSION)
-if ( NOT TARGET yaml )
+if(NOT TARGET yaml)
  	_yaml_Find_Config()
 endif()
-if ( NOT TARGET yaml )
-        _yaml_Find_Pkgconfig()
+if(NOT TARGET yaml)
+	_yaml_Find_Cache()
+endif()
+if(NOT TARGET yaml)
+	_yaml_Find_Pkgconfig()
 endif()
-if ( TARGET yaml )
-        get_target_property(yaml_LIBRARIES yaml IMPORTED_LOCATION)
-        get_target_property(yamlpkg_INCLUDE_DIRS yaml INTERFACE_INCLUDE_DIRECTORIES)
-else()
-        unset(yamlpkg_INCLUDE_DIRS CACHE)
-        unset(yamlpkg_INCLUDE_DIRS)
-        unset(yaml_LIBRARIES CACHE)
-        unset(yaml_LIBRARIES)
-        unset(yaml_FOUND CACHE)
+if(NOT TARGET yaml)
+	unset(yaml_INCLUDE_DIRS CACHE)
+	unset(yaml_INCLUDE_DIRS)
+	unset(yaml_LIBRARIES CACHE)
+	unset(yaml_LIBRARIES)
+	unset(yaml_FOUND CACHE)
 	unset(yaml_FOUND)
 endif()